From 104f964760a727cb1d4451d8c4f749ab69ea6b35 Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 3 Apr 2008 17:49:56 +0000 Subject: [PATCH] fixed an exploit where no enemies are present in starting sector: Go to tactical before you hire any merc. Then hire a merc and compress time until merc arrives. Then you arrive in Omerta and no enemies are present. Also the chopper animation was not played. I simply disabled the "Go to tactical button" if the user has not hired any merc. This eliminates all the "bad" side effects. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1981 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Map Screen Interface Bottom.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Strategic/Map Screen Interface Bottom.cpp b/Strategic/Map Screen Interface Bottom.cpp index 06b0ea5a..76d00d2c 100644 --- a/Strategic/Map Screen Interface Bottom.cpp +++ b/Strategic/Map Screen Interface Bottom.cpp @@ -1678,6 +1678,15 @@ BOOLEAN AllowedToExitFromMapscreenTo( INT8 bExitToWhere ) return( FALSE ); } + // WANNE: At least one merc must be hired so we can go to tactical. + // This was an exploit. If you go to tactical in Omerta and have not hired any merc + // then go back to laptop and hire a merc. After the merc arrives the heli landing was not + // shown and the sector was free of enemies. + if (bExitToWhere == MAP_EXIT_TO_TACTICAL && gfAtLeastOneMercWasHired == FALSE) + { + return ( FALSE ); + } + // if already going someplace else if ( ( gbExitingMapScreenToWhere != -1 ) && ( gbExitingMapScreenToWhere != bExitToWhere ) ) {