From d9437117bb17c29912c55be32bd330c8cdbb4358 Mon Sep 17 00:00:00 2001 From: ChrisL Date: Tue, 14 Jun 2011 14:43:30 +0000 Subject: [PATCH] BUGFIX 523 - When retreating from combat, the code was designed to add 5 minutes to the game clock. Not sure why. Possibly to resolve an exploit? Anyway, if another travel group had an arrival time within that 5 minute span, an Assertion error would result. This fixes that by removing the 5 minute "retreat charge". git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4500 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/PreBattle Interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Strategic/PreBattle Interface.cpp b/Strategic/PreBattle Interface.cpp index 960d07e7..f7cfe619 100644 --- a/Strategic/PreBattle Interface.cpp +++ b/Strategic/PreBattle Interface.cpp @@ -1511,7 +1511,7 @@ void RetreatMercsCallback( GUI_BUTTON *btn, INT32 reason ) } //Warp time by 5 minutes so that player can't just go back into the sector he left. - WarpGameTime( 300, WARPTIME_NO_PROCESSING_OF_EVENTS ); + //WarpGameTime( 300, WARPTIME_NO_PROCESSING_OF_EVENTS ); ResetMovementForEnemyGroupsInLocation( gubPBSectorX, gubPBSectorY ); btn->uiFlags &= ~BUTTON_CLICKED_ON;