From 6cf3fbbe5aea7b6226b2bdc55736fd7ac357be33 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 29 Jun 2007 21:19:11 +0000
Subject: [PATCH] - added new militia control command

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp                  |  2 +-
 JA2.vcproj                       |  8 ++---
 Strategic/Map Screen Interface.h |  1 +
 Tactical/Militia Control.cpp     | 55 ++++++++++++++++++++++++++++++++
 Utils/_DutchText.cpp             |  1 +
 Utils/_EnglishText.cpp           |  1 +
 Utils/_FrenchText.cpp            |  1 +
 Utils/_ItalianText.cpp           |  1 +
 Utils/_PolishText.cpp            |  1 +
 Utils/_RussianText.cpp           |  1 +
 10 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index aecdd25b..97b9a0cd 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -23,7 +23,7 @@ CHAR16 zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION  
-	CHAR16		zVersionLabel[256]		= { L"Release v1.13.933" };
+	CHAR16		zVersionLabel[256]		= { L"Release v1.13.1020" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index 75d2796a..fa75401c 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -43,10 +43,9 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib lua51.lib"
-				OutputFile="C:\Games\Jagged Alliance 2\ja2_debug_933_en.exe"
+				OutputFile="C:\Games\Jagged Alliance 2\ja2_debug_1020_en.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;.\..\..\Standard Gaming Platform\&quot;"
 				IgnoreDefaultLibraryNames="libcmt"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/ja2_cvs.pdb"
@@ -545,11 +544,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib lua51_vs2003.lib"
-				OutputFile="C:\games\Jagged Alliance 2\JA2 v1.13.933_EN.exe"
+				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib lua51.lib"
+				OutputFile="D:\games\Jagged Alliance 2 v1.13\JA2 v1.13.1020_EN.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
 				IgnoreDefaultLibraryNames=""
 				GenerateMapFile="TRUE"
 				MapFileName=".\Release/ja2_cvs.map"
diff --git a/Strategic/Map Screen Interface.h b/Strategic/Map Screen Interface.h
index 8cb5e1b5..44e12f72 100644
--- a/Strategic/Map Screen Interface.h	
+++ b/Strategic/Map Screen Interface.h	
@@ -65,6 +65,7 @@ enum{
 	MILCON_MENU_ALL_HOLD,
 	MILCON_MENU_ALL_RETREAT,
 	MILCON_MENU_ALL_COMETOME,
+	MILCON_MENU_ALL_SPREAD,
 	MILCON_MENU_ALL_GETDOWN,
 	MILCON_MENU_ALL_TAKE_COVER,
 	//MILCON_MENU_ALL_TAKE_ITEMS,
diff --git a/Tactical/Militia Control.cpp b/Tactical/Militia Control.cpp
index 9361df92..1e893574 100644
--- a/Tactical/Militia Control.cpp	
+++ b/Tactical/Militia Control.cpp	
@@ -963,6 +963,7 @@ void HandleShadingOfLinesForMilitiaControlMenu( void )
 		UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_HOLD );
 		UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_RETREAT );
 		UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_COMETOME );
+		UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_SPREAD );
 		UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_GETDOWN );
 		UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_TAKE_COVER );
 		//UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_TAKE_ITEMS );
@@ -973,6 +974,7 @@ void HandleShadingOfLinesForMilitiaControlMenu( void )
 		ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_HOLD );
 		ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_RETREAT );
 		ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_COMETOME );
+		ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_SPREAD );
 		ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_GETDOWN );
 		ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_TAKE_COVER );
 		//ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_TAKE_ITEMS );
@@ -1590,6 +1592,59 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 					}
 					break;
 				
+
+				case( MILCON_MENU_ALL_SPREAD ):
+					{
+						UINT8 cnt;
+						INT16 sActionGridNo;
+						SOLDIERTYPE *pTeamSoldier;
+
+						cnt = gTacticalStatus.Team[ MILITIA_TEAM ].bFirstID;
+
+						for ( pTeamSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ MILITIA_TEAM ].bLastID; cnt++, pTeamSoldier++)
+						{
+							if ( (pTeamSoldier->bActive) && (pTeamSoldier->bInSector) && (pTeamSoldier->bLife >= OKLIFE) )
+							{
+
+								// See if we can get there
+								sActionGridNo =  RandDestWithinRange( pTeamSoldier );
+								if ( sActionGridNo != -1 )
+								{
+									// SEND PENDING ACTION
+									pTeamSoldier->sPendingActionData2  = sActionGridNo;
+									//pTeamSoldier->bPendingActionData3  = ubDirection;
+									pTeamSoldier->ubPendingActionAnimCount = 0;
+									pTeamSoldier->usUIMovementMode = RUNNING;
+
+									// CHECK IF WE ARE AT THIS GRIDNO NOW
+									if ( pTeamSoldier->sGridNo != sActionGridNo )
+									{
+										// WALK UP TO DEST FIRST
+										SendGetNewSoldierPathEvent( pTeamSoldier, sActionGridNo, pTeamSoldier->usUIMovementMode );
+									}
+								}
+
+							}
+						}
+
+						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
+						{
+							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
+						}
+
+						// stop showing menu
+						fShowMilitiaControlMenu = FALSE;
+						giAssignHighLine = -1;
+
+						// set dirty flag
+						fTeamPanelDirty = TRUE;
+						fMapScreenBottomDirty = TRUE;
+					}
+					break;
+
+
+
 				case( MILCON_MENU_ALL_GETDOWN ):
 					{
 						UINT8 cnt;
diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp
index 6ef2c8fd..3429e7bf 100644
--- a/Utils/_DutchText.cpp
+++ b/Utils/_DutchText.cpp
@@ -627,6 +627,7 @@ STR16 pMilitiaControlMenuStrings[] =
 	L"All: Hold Position",
 	L"All: Retreat",
 	L"All: Come to me",
+	L"All: Spread out",
 	L"All: Get down",
 	L"All: Take cover",
 	//L"All: Find items",
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 56b6d4ab..d6fa3093 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -642,6 +642,7 @@ STR16 pMilitiaControlMenuStrings[] =
 	L"All: Hold Position",
 	L"All: Retreat",
 	L"All: Come to me",
+	L"All: Spread out",
 	L"All: Get down",
 	L"All: Take cover",
 	//L"All: Find items",
diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
index ce1361ad..c0518378 100644
--- a/Utils/_FrenchText.cpp
+++ b/Utils/_FrenchText.cpp
@@ -633,6 +633,7 @@ STR16 pMilitiaControlMenuStrings[] =
 	L"All: Hold Position",
 	L"All: Retreat",
 	L"All: Come to me",
+	L"All: Spread out",
 	L"All: Get down",
 	L"All: Take cover",
 	//L"All: Find items",
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index 78b07841..e7b6a90a 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -626,6 +626,7 @@ STR16 pMilitiaControlMenuStrings[] =
 	L"All: Hold Position",
 	L"All: Retreat",
 	L"All: Come to me",
+	L"All: Spread out",
 	L"All: Get down",
 	L"All: Take cover",
 	//L"All: Find items",
diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp
index cccf08a1..113c4927 100644
--- a/Utils/_PolishText.cpp
+++ b/Utils/_PolishText.cpp
@@ -627,6 +627,7 @@ STR16 pMilitiaControlMenuStrings[] =
 	L"All: Hold Position",
 	L"All: Retreat",
 	L"All: Come to me",
+	L"All: Spread out",
 	L"All: Get down",
 	L"All: Take cover",
 	//L"All: Find items",
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index 9417102a..6ecc3a6c 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -637,6 +637,7 @@ STR16 pMilitiaControlMenuStrings[] =
 	L"All: Hold Position",
 	L"All: Retreat",
 	L"All: Come to me",
+	L"All: Spread out",
 	L"All: Get down",
 	L"All: Take cover",
 	//L"All: Find items",