adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix two bugs regarding stale SIS messages, from Kruzen

Browse Source 
When entering Hyperspace on Auto-Pilot, or are intercepted by
neutral or hostile alien ships during Auto-Pilot, the text at the
top of the screen doesn't update properly until the status
would need to change. This corrects the times when DrawSisMessage
is called to keep that up-to-date as needed.

This patch was backported from the Mega-Mod.
This commit is contained in:
Michael Martin
2020-10-05 21:22:51 -07:00
parent 8da99fc5d1
commit c7bdd74ee6
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -62,6 +62,7 @@
current Sourceforge installs; generic support now available for both HTTPS current Sourceforge installs; generic support now available for both HTTPS
and automatic redirection to mirrors - Michael and automatic redirection to mirrors - Michael
- Fixed MSYS resource script compilation/linking, from Ala-lala - Fixed MSYS resource script compilation/linking, from Ala-lala
- Fixed stale main-screen header text displays, from Kruzen
0.7.1: 0.7.1:
- New SDL2 backend for modern operating systems - Michael - New SDL2 backend for modern operating systems - Michael
sc2/src/uqm/encount.c
+1
View File
@@ -326,6 +326,7 @@ InitEncounter (void)
t.CharCount = (COUNT)~0; t.CharCount = (COUNT)~0;
font_DrawText (&t); font_DrawText (&t);
} }
DrawSISMessage (NULL);
s.origin.x = SIS_SCREEN_WIDTH >> 1; s.origin.x = SIS_SCREEN_WIDTH >> 1;
s.origin.y = SIS_SCREEN_HEIGHT >> 1; s.origin.y = SIS_SCREEN_HEIGHT >> 1;
sc2/src/uqm/hyper.c
+3
View File
@@ -349,7 +349,10 @@ LoadHyperspace (void)
RepairSISBorder (); RepairSISBorder ();
} }
} }
if (!(GLOBAL (autopilot.x) != ~0 && GLOBAL (autopilot.y) != ~0))
{
DrawSISMessage (NULL); DrawSISMessage (NULL);
}
SetContext (RadarContext); SetContext (RadarContext);
SetContextBackGroundColor ( SetContextBackGroundColor (