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

Fixed a bug (#587) when loading from hyperspace, from Nic and Michael

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1331 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2004-02-24 04:52:58 +00:00
parent a6ce0b5f35
commit 5d23241647
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.4: Changes towards version 0.4:
- Fixed various odd behaviors when loading from HyperSpace (bug #587),
from Nic and Michael
- Added new 'triscan' scaler; derived from scale2x[.sf.net] -Alex - Added new 'triscan' scaler; derived from scale2x[.sf.net] -Alex
- Space marines die in a self-destructing Scout (Bug #445), from Nic - Space marines die in a self-destructing Scout (Bug #445), from Nic
- Added the -l option to produce logfiles (bug #560), from Nic - Added the -l option to produce logfiles (bug #560), from Nic
sc2/src/sc2code/battle.c
+8 -1
View File
@@ -182,9 +182,11 @@ DoBattle (BATTLE_STATE *bs)
SetTransitionSource (&r); SetTransitionSource (&r);
} }
BatchGraphics (); BatchGraphics ();
if (LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE) if ((LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE) &&
!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)))
SeedUniverse (); SeedUniverse ();
RedrawQueue (TRUE); RedrawQueue (TRUE);
if (bs->first_time) if (bs->first_time)
{ {
bs->first_time = FALSE; bs->first_time = FALSE;
@@ -192,6 +194,11 @@ DoBattle (BATTLE_STATE *bs)
} }
UnbatchGraphics (); UnbatchGraphics ();
UnlockMutex (GraphicsLock); UnlockMutex (GraphicsLock);
if ((!(GLOBAL (CurrentActivity) & IN_BATTLE)) ||
(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)))
{
return FALSE;
}
if (nth_frame) if (nth_frame)
TaskSwitch (); TaskSwitch ();
else else