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

Fixed crashes and potential weirdness when loading savegames from a Homeworld encounter screen

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3169 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-07-04 07:25:58 +00:00
parent 85191e5541
commit ad23012567
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/planets/solarsys.c
+7 -3
View File
@@ -1531,9 +1531,13 @@ UninitSolarSys (void)
if (GLOBAL (CurrentActivity) & END_INTERPLANETARY)
{
GLOBAL (CurrentActivity) &= ~END_INTERPLANETARY;
(*pSolarSysState->GenFunc) (UNINIT_NPCS);
SET_GAME_STATE (USED_BROADCASTER, 0);
if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)))
{ // These are game state changing ops and so cannot be
// called once another game has been loaded!
(*pSolarSysState->GenFunc) (UNINIT_NPCS);
SET_GAME_STATE (USED_BROADCASTER, 0);
}
}
else if ((GLOBAL (CurrentActivity) & START_ENCOUNTER) && EncounterGroup)
{