From c20232a740e6e234d8412426fa858d12bae22cd4 Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 26 May 2016 12:27:49 +0000 Subject: [PATCH] Fix: when starting a new campaign, NULL the StrategicMap flagmask git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8237 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/strategicmap.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index ca973e1c..5b512f90 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -1894,10 +1894,12 @@ void InitializeSAMSites( void ) { StrategicMap[gpSamSectorX[cnt] + (MAP_WORLD_X * gpSamSectorY[cnt])].bSAMCondition = 100; }; - //StrategicMap[(SAM_1_X)+(MAP_WORLD_X*(SAM_1_Y))].bSAMCondition = 100; - //StrategicMap[(SAM_2_X)+(MAP_WORLD_X*(SAM_2_Y))].bSAMCondition = 100; - //StrategicMap[(SAM_3_X)+(MAP_WORLD_X*(SAM_3_Y))].bSAMCondition = 100; - //StrategicMap[(SAM_4_X)+(MAP_WORLD_X*(SAM_4_Y))].bSAMCondition = 100; + + // Flugente, bizarrely enough, this structure is not NULLED when starting a new campaign. For now, we NULL the flagmask to clear at least that + for ( INT32 cnt = 0; cnt < MAP_WORLD_X*MAP_WORLD_Y; ++cnt ) + { + StrategicMap[cnt].usFlags = 0; + } UpdateAirspaceControl( ); }