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

Fix for picking up talking pet after Umgah genocide - from Paxtez

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1071 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2003-07-20 16:29:18 +00:00
parent c19fdcc1ae
commit 4f41ce8158
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.3: Changes towards version 0.3:
- Fix for picking up talking pet after Umgah genocide - from Paxtez
- MinGW compilation fixes - SvdB+Mika - MinGW compilation fixes - SvdB+Mika
- Bilinear scaler is now faster, has 24bpp mode and uses regions -Alex - Bilinear scaler is now faster, has 24bpp mode and uses regions -Alex
- Accept CRLF line endings in .txt and .ts files - SvdB - Accept CRLF line endings in .txt and .ts files - SvdB
sc2/src/sc2code/planets/genpet.c
+10 -1
View File
@@ -188,7 +188,7 @@ GenerateTalkingPet (BYTE control)
} }
pSolarSysState->MenuState.Initialized -= 2; pSolarSysState->MenuState.Initialized -= 2;
} }
if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD))) if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)))
{ {
BOOLEAN UmgahSurvivors; BOOLEAN UmgahSurvivors;
@@ -202,7 +202,16 @@ GenerateTalkingPet (BYTE control)
ZapToUrquanEncounter (); ZapToUrquanEncounter ();
else if (GET_GAME_STATE (UMGAH_ZOMBIE_BLOBBIES) else if (GET_GAME_STATE (UMGAH_ZOMBIE_BLOBBIES)
&& !UmgahSurvivors) && !UmgahSurvivors)
{
// Defeated the zombie fleet.
InitCommunication (TALKING_PET_CONVERSATION); InitCommunication (TALKING_PET_CONVERSATION);
}
else if (!(ActivateStarShip (UMGAH_SHIP, SPHERE_TRACKING)))
{
// The Kohr-Ah have destroyed the Umgah, but the
// talking pet survived.
InitCommunication (TALKING_PET_CONVERSATION);
}
ReinitQueue (&GLOBAL (npc_built_ship_q)); ReinitQueue (&GLOBAL (npc_built_ship_q));
GetGroupInfo (0L, 0); GetGroupInfo (0L, 0);