From 64a971edecfd7b78eaf08397023db5663ea12edb Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 14 Mar 2018 20:20:13 +0000
Subject: [PATCH] If MILITIA_STRATEGIC_COMMAND_REQUIRES_MERC is FALSE, militia
 can be controlled everywhere even without staffing a HQ

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8548 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameSettings.cpp          |  3 ++-
 GameSettings.h            |  1 +
 GameVersion.cpp           | 18 +++++++++---------
 Strategic/Assignments.cpp |  4 ++++
 ja2_VS2017.vcxproj        | 10 ++++++++++
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/GameSettings.cpp b/GameSettings.cpp
index b0060f21..24550d65 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -2124,7 +2124,8 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.dMilitiaVolunteerMultiplierFarm		= iniReader.ReadFloat( "Militia Volunteer Pool Settings", "MILITIA_VOLUNTEER_POOL_MULTIPLIER_FARM", 0.05f, 0.0f, 1.0f );
 	
 	//################# Militia Strategic Movement Settings ##################
-	gGameExternalOptions.fMilitiaStrategicCommand				= iniReader.ReadBoolean("Militia Strategic Movement Settings", "ALLOW_MILITIA_STRATEGIC_COMMAND", FALSE );
+	gGameExternalOptions.fMilitiaStrategicCommand				= iniReader.ReadBoolean( "Militia Strategic Movement Settings", "ALLOW_MILITIA_STRATEGIC_COMMAND", FALSE );
+	gGameExternalOptions.fMilitiaStrategicCommand_MercRequired	= iniReader.ReadBoolean( "Militia Strategic Movement Settings", "MILITIA_STRATEGIC_COMMAND_REQUIRES_MERC", TRUE );
 	
 	// SANDRO - added several bonuses for militia 
 	//################# Militia Strength Settings ##################
diff --git a/GameSettings.h b/GameSettings.h
index 083ab14a..bdeaef79 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -478,6 +478,7 @@ typedef struct
 
 	// Flugente: militia movement
 	BOOLEAN fMilitiaStrategicCommand;
+	BOOLEAN fMilitiaStrategicCommand_MercRequired;
 	
 	BOOLEAN gfAllowReinforcements;
 	BOOLEAN gfAllowReinforcementsOnlyInCity;
diff --git a/GameVersion.cpp b/GameVersion.cpp
index 7012369a..e6db5f8b 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -15,9 +15,9 @@
 #ifdef JA2EDITOR
 	
 	#ifdef JA2UB
-		CHAR16 zVersionLabel[256]		= { L"Unfinished Business - Map Editor v1.13.8545 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Unfinished Business - Map Editor v1.13.8548 (Development Build)" }; 
 	#else
-		CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.8545 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.8548 (Development Build)" }; 
 	#endif
 
 // ------------------------------
@@ -27,11 +27,11 @@
 
 	//DEBUG BUILD VERSION	
 	#ifdef JA2UB
-		CHAR16 zVersionLabel[256]		= { L"Debug: Unfinished Business - v1.13.8545 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: Unfinished Business - v1.13.8548 (Development Build)" }; 
 	#elif defined (JA113DEMO)
-		CHAR16 zVersionLabel[256]		= { L"Debug: JA2 Demo - v1.13.8545 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: JA2 Demo - v1.13.8548 (Development Build)" }; 
 	#else
-		CHAR16 zVersionLabel[256]		= { L"Debug: v1.13.8545 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: v1.13.8548 (Development Build)" }; 
 	#endif
 
 #elif defined CRIPPLED_VERSION
@@ -46,16 +46,16 @@
 
 	//RELEASE BUILD VERSION	
 	#ifdef JA2UB
-		CHAR16		zVersionLabel[256]		= { L"Release Unfinished Business - v1.13.8545 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release Unfinished Business - v1.13.8548 (Development Build)" };
 	#elif defined (JA113DEMO)
-		CHAR16		zVersionLabel[256]		= { L"Release JA2 Demo - v1.13.8545 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release JA2 Demo - v1.13.8548 (Development Build)" };
 	#else
-		CHAR16		zVersionLabel[256]		= { L"Release v1.13.8545 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release v1.13.8548 (Development Build)" };
 	#endif
 
 #endif
 										
-CHAR8		czVersionNumber[16]	= { "Build 18.03.11" };		//YY.MM.DD
+CHAR8		czVersionNumber[16]	= { "Build 18.03.14" };		//YY.MM.DD
 CHAR16		zTrackingNumber[16]	= { L"Z" };
 	
 // SAVE_GAME_VERSION is defined in header, change it there
diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp
index 0d5b5baf..6cc39bef 100644
--- a/Strategic/Assignments.cpp
+++ b/Strategic/Assignments.cpp
@@ -21522,6 +21522,10 @@ void MoveItemMenuMvtCallback(MOUSE_REGION * pRegion, INT32 iReason )
 
 BOOLEAN MercStaffsMilitaryHQ()
 {
+	// if we don't need a HQ, this is easy
+	if ( !gGameExternalOptions.fMilitiaStrategicCommand_MercRequired )
+		return TRUE;
+
 	SOLDIERTYPE *pSoldier = NULL;
 	UINT32 uiCnt = 0;
 	UINT32 firstid = gTacticalStatus.Team[ OUR_TEAM ].bFirstID;
diff --git a/ja2_VS2017.vcxproj b/ja2_VS2017.vcxproj
index 7852075c..28dcde76 100644
--- a/ja2_VS2017.vcxproj
+++ b/ja2_VS2017.vcxproj
@@ -105,26 +105,36 @@
     <LinkIncremental>true</LinkIncremental>
     <TargetName>$(JA2Config)_$(JA2LangPrefix)_$(Configuration)</TargetName>
     <TargetExt>.exe</TargetExt>
+    <OutDir>..\..\..\JA2 C17\</OutDir>
+    <IntDir>..\..\..\JA2 C17\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <TargetExt>.exe</TargetExt>
     <TargetName>MapEditor_$(JA2LangPrefix)_Debug</TargetName>
+    <OutDir>..\..\..\JA2 C17\</OutDir>
+    <IntDir>..\..\..\JA2 C17\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>$(JA2Config)_$(JA2LangPrefix)_$(Configuration)</TargetName>
     <TargetExt>.exe</TargetExt>
+    <OutDir>..\..\..\JA2 C17\</OutDir>
+    <IntDir>..\..\..\JA2 C17\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditor|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>MapEditor_$(JA2LangPrefix)_Release</TargetName>
     <TargetExt>.exe</TargetExt>
+    <OutDir>..\..\..\JA2 C17\</OutDir>
+    <IntDir>..\..\..\JA2 C17\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WithDebugInfo|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>$(JA2Config)_$(JA2LangPrefix)_$(Configuration)</TargetName>
     <TargetExt>.exe</TargetExt>
+    <OutDir>..\..\..\JA2 C17\</OutDir>
+    <IntDir>..\..\..\JA2 C17\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>