From 4dcdd17a91ee7cb911ac50a11e042112c4e64656 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 21 Jul 2013 21:23:53 +0000 Subject: [PATCH] - Bugfix: After Mike has been recruited, he could still show up as an enemy later in the game (a Mike clone) (by anv and silversurfer) o Similar fix is also applied for Iggy git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6238 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Campaign.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp index e83204f4e..bfcd4caca 100644 --- a/Tactical/Campaign.cpp +++ b/Tactical/Campaign.cpp @@ -1727,14 +1727,20 @@ void HourlyProgressUpdate(void) // at 50% make Mike available to the strategic AI if ( ubCurrentProgress >= gGameExternalOptions.ubGameProgressMikeAvailable && gStrategicStatus.ubHighestProgress <= gGameExternalOptions.ubGameProgressMikeAvailable ) { - SetFactTrue( FACT_MIKE_AVAILABLE_TO_ARMY ); + if( gubFact[FACT_MIKE_AVAILABLE_TO_ARMY] < 2 ); + { + SetFactTrue( FACT_MIKE_AVAILABLE_TO_ARMY ); + } } // at 70% add Iggy to the world if ( ubCurrentProgress >= gGameExternalOptions.ubGameProgressIggyAvaliable && gStrategicStatus.ubHighestProgress <= gGameExternalOptions.ubGameProgressIggyAvaliable ) { - gMercProfiles[ IGGY ].sSectorX = 5; - gMercProfiles[ IGGY ].sSectorY = MAP_ROW_C; + if ( gubFact[ FACT_IGGY_AVAILABLE_TO_ARMY ] < 2 ) + { + gMercProfiles[ IGGY ].sSectorX = 5; + gMercProfiles[ IGGY ].sSectorY = MAP_ROW_C; + } } // Flugente: on certain progress levels, the queen decides to initiate major attacks