From b68df576ac64d7fec4ee7ac44e43ae35a19df398 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 29 Jun 2006 17:34:06 +0000
Subject: [PATCH] - bug fix: No militia are present in the sector (not city
 sector) for the battle, even though they do appear on the strategy map.
 Happens when mercs are in sector and a militia group arrives.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.vcproj                  | 4 ++--
 Strategic/MilitiaSquads.cpp | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/JA2.vcproj b/JA2.vcproj
index dd1b50fe..df3bdb9c 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
-				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.307_2006_06_28.exe"
+				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.311_2006_06_29.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.307_2006_06_28.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.311_2006_06_29.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Strategic/MilitiaSquads.cpp b/Strategic/MilitiaSquads.cpp
index b9a4c1d3..c986050e 100644
--- a/Strategic/MilitiaSquads.cpp
+++ b/Strategic/MilitiaSquads.cpp
@@ -546,6 +546,14 @@ void UpdateMilitiaSquads(INT16 sMapX, INT16 sMapY )
 			MoveMilitiaSquad( sMapX, sMapY,  SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ), FALSE );
 			AddToBlockMoveList( SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ) );
 
+			if ( gWorldSectorX == SECTORX( pMoveDir[ iRandomRes ][0] ) && 
+				  gWorldSectorY == SECTORY( pMoveDir[ iRandomRes ][0] ) && 
+				  !gbWorldSectorZ )
+			{
+				gfStrategicMilitiaChangesMade = TRUE;
+				ResetMilitia();
+			}
+
 			if( NumEnemiesInSector( SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ) ) )
 			{
 /*				GROUP* pEnemyGroup = GetGroup( GetEnemyGroupIdInSector( SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ) ) );