From 10208ca5af424d1cc9df70158574d443731ec4e0 Mon Sep 17 00:00:00 2001
From: SpaceViking <SpaceViking@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 4 Sep 2007 04:06:23 +0000
Subject: [PATCH] Bug fix for militia movement on strategic screen not setting
 group ID for battles.

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

diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp
index 9555811b3..77f64fb7f 100644
--- a/Strategic/Auto Resolve.cpp	
+++ b/Strategic/Auto Resolve.cpp	
@@ -1957,6 +1957,10 @@ static void ARCreateMilitia( UINT8 mclass, INT32 i, INT16 sX, INT16 sY)
 	// reset counter of how many mortars this team has rolled
 	ResetMortarsOnTeamCount();
 
+	if( !gpBattleGroup ) {
+		AssertMsg(0, "No battle group set while creating militia");
+	}
+
 	if( mclass == SOLDIER_CLASS_ELITE_MILITIA )
 	{
 		gpCivs[i].pSoldier = TacticalCreateMilitia( SOLDIER_CLASS_ELITE_MILITIA );
diff --git a/Strategic/MilitiaSquads.cpp b/Strategic/MilitiaSquads.cpp
index c40b46e1f..848b2c4b6 100644
--- a/Strategic/MilitiaSquads.cpp
+++ b/Strategic/MilitiaSquads.cpp
@@ -25,6 +25,7 @@
 	#include "math.h"
 	#include "Auto Resolve.h"
 	#include "Vehicles.h"
+	#include "Tactical Save.h"
 #endif
 
 #include "MilitiaSquads.h"
@@ -506,6 +507,7 @@ void UpdateMilitiaSquads(INT16 sMapX, INT16 sMapY )
 		{
 			if( GetWorldHour() % 2 )return;
 
+			memset(pMoveDir, 0, sizeof(pMoveDir));
 			GenerateDirectionInfos( sMapX, sMapY, &uiDirNumber, pMoveDir, FALSE, FALSE, FALSE );
 
 			if( uiDirNumber )
@@ -543,32 +545,39 @@ void UpdateMilitiaSquads(INT16 sMapX, INT16 sMapY )
 								return;
 						}
 
-					MoveMilitiaSquad( sMapX, sMapY,  SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ), FALSE );
-					AddToBlockMoveList( SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ) );
+					// WDS bug fix for moving militia
+					int targetX = SECTORX( pMoveDir[ iRandomRes ][0] );
+					int targetY = SECTORY( pMoveDir[ iRandomRes ][0] );
+					Assert(targetX >= 0 && targetX < MAP_WORLD_X);
+					Assert(targetY >= 0 && targetY < MAP_WORLD_Y);
+					MoveMilitiaSquad( sMapX, sMapY,  targetX, targetY, FALSE );
+					AddToBlockMoveList( targetX, targetY );
 					if ( gfStrategicMilitiaChangesMade)
 					{
 						ResetMilitia();
 					}
 
-					if( NumEnemiesInSector( SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ) ) )
+					if( NumEnemiesInSector( targetX, targetY ) )
 					{
-		/*				GROUP* pEnemyGroup = GetGroup( GetEnemyGroupIdInSector( SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0] ) ) );
+						extern GROUP *gpBattleGroup;
+						gpBattleGroup = GetGroup( GetEnemyGroupIdInSector( targetX, targetY ) );
+		/*				GROUP* pEnemyGroup = GetGroup( GetEnemyGroupIdInSector( targetX, targetY ) );
 				
 						if(pEnemyGroup && pEnemyGroup->ubGroupID)
 						{
-							//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Attacking from %ld,%ld to %ld,%ld - enemy's group id %ld", sMapX, sMapY, SECTORX( pMoveDir[ iRandomRes ][0] ), SECTORY( pMoveDir[ iRandomRes ][0], pEnemyGroup->ubGroupID ));
+							//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Attacking from %ld,%ld to %ld,%ld - enemy's group id %ld", sMapX, sMapY, targetX, SECTORY( pMoveDir[ iRandomRes ][0], pEnemyGroup->ubGroupID ));
 							//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Arrival 1, Arrival 2");
 
 							pEnemyGroup->ubPrevX = sMapX;
 							pEnemyGroup->ubPrevY = sMapY;
 
-							pEnemyGroup->ubNextX = SECTORX( pMoveDir[ iRandomRes ][0] );
-							pEnemyGroup->ubNextY = SECTORY( pMoveDir[ iRandomRes ][0] );
+							pEnemyGroup->ubNextX = targetX;
+							pEnemyGroup->ubNextY = targetY;
 		*/					
 							gfMSBattle = TRUE;
 			
 			//				GroupArrivedAtSector( pEnemyGroup->ubGroupID , TRUE, FALSE );
-							EnterAutoResolveMode( SECTORX( pMoveDir[ iRandomRes ][0] ),  SECTORY( pMoveDir[ iRandomRes ][0] ) );
+							EnterAutoResolveMode( targetX,  targetY );
 		//				}
 					}
 			}