From 5aad9fc2dc5c97beadc7594e3a8b48c6524fbc47 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Wed, 12 Jan 2022 02:44:17 +0000 Subject: [PATCH] Fixed bug where clicking where radar screen would be during Tactical Placement GUI broke it and allowed to enter map without placing anyone. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9250 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- TileEngine/Radar Screen.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TileEngine/Radar Screen.cpp b/TileEngine/Radar Screen.cpp index 540e2bfc5..c949f0290 100644 --- a/TileEngine/Radar Screen.cpp +++ b/TileEngine/Radar Screen.cpp @@ -29,6 +29,7 @@ extern INT8 gbWorldSectorZ; extern BOOLEAN AreInMeanwhile(); #include "connect.h" +extern BOOLEAN gfTacticalPlacementGUIActive; extern INT32 iCurrentMapSectorZ; extern UINT16 UI_BOTTOM_X; extern UINT16 UI_BOTTOM_Y; @@ -279,7 +280,7 @@ void RadarRegionButtonCallback( MOUSE_REGION * pRegion, INT32 iReason ) INT16 sRadarX, sRadarY; // check if we are allowed to do anything? - if( fRenderRadarScreen == FALSE ) + if( fRenderRadarScreen == FALSE || gfTacticalPlacementGUIActive) { return; }