From 4f41ce8158ade8be687174c831d2b7525bc06968 Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sun, 20 Jul 2003 16:29:18 +0000
Subject: [PATCH] Fix for picking up talking pet after Umgah genocide - from
 Paxtez

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1071 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog                    |  1 +
 sc2/src/sc2code/planets/genpet.c | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 06b54e94d..bd8126d44 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.3:
+- Fix for picking up talking pet after Umgah genocide - from Paxtez
 - MinGW compilation fixes - SvdB+Mika
 - Bilinear scaler is now faster, has 24bpp mode and uses regions -Alex
 - Accept CRLF line endings in .txt and .ts files - SvdB
diff --git a/sc2/src/sc2code/planets/genpet.c b/sc2/src/sc2code/planets/genpet.c
index a9f22211e..86a40c1cc 100644
--- a/sc2/src/sc2code/planets/genpet.c
+++ b/sc2/src/sc2code/planets/genpet.c
@@ -188,7 +188,7 @@ GenerateTalkingPet (BYTE control)
 					}
 					pSolarSysState->MenuState.Initialized -= 2;
 				}
-
+		
 				if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)))
 				{
 					BOOLEAN UmgahSurvivors;
@@ -202,7 +202,16 @@ GenerateTalkingPet (BYTE control)
 						ZapToUrquanEncounter ();
 					else if (GET_GAME_STATE (UMGAH_ZOMBIE_BLOBBIES)
 							&& !UmgahSurvivors)
+					{
+						// Defeated the zombie fleet.
 						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));
 					GetGroupInfo (0L, 0);