From 78d73cc221094e764873212c9a5f7909b12e8978 Mon Sep 17 00:00:00 2001
From: Sevenfm <Sevenfm@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 26 Apr 2021 05:41:23 +0000
Subject: [PATCH] Removed unused options: ARMY_USES_TANKS_IN_ATTACKS,
 ARMY_USES_TANKS_IN_PATROLS, ARMY_USES_JEEPS_IN_ATTACKS,
 ARMY_USES_JEEPS_IN_PATROLS, ARMY_USES_ROBOTS_IN_ATTACKS,
 ARMY_USES_ROBOTS_IN_PATROLS (by rftr).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameSettings.cpp           | 10 +---------
 GameSettings.h             |  8 --------
 GameVersion.cpp            |  4 ++--
 Strategic/Strategic AI.cpp | 12 +++---------
 4 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/GameSettings.cpp b/GameSettings.cpp
index 50d904e93..32e23606b 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -1845,16 +1845,8 @@ void LoadGameExternalOptions()
 	//dnl ch68 090913 Don't allow permanent items removal from sector
 	gGameExternalOptions.fNoRemoveRandomSectorItems			= iniReader.ReadBoolean("Strategic GamePlay Settings", "NO_REMOVE_RANDOM_SECTOR_ITEMS", TRUE );
 
-	gGameExternalOptions.fArmyUsesTanksInAttacks			= iniReader.ReadBoolean("Strategic Gameplay Settings","ARMY_USES_TANKS_IN_ATTACKS", FALSE);
-	gGameExternalOptions.fArmyUsesTanksInPatrols			= iniReader.ReadBoolean("Strategic Gameplay Settings","ARMY_USES_TANKS_IN_PATROLS", FALSE);
-	gGameExternalOptions.usTankMinimumProgress				= iniReader.ReadInteger("Strategic Gameplay Settings","TANK_MINIMUM_PROGRESS", 60, 0, 100);
-
-	gGameExternalOptions.fArmyUsesJeepsInAttacks			= iniReader.ReadBoolean( "Strategic Gameplay Settings", "ARMY_USES_JEEPS_IN_ATTACKS", FALSE );
-	gGameExternalOptions.fArmyUsesJeepsInPatrols			= iniReader.ReadBoolean( "Strategic Gameplay Settings", "ARMY_USES_JEEPS_IN_PATROLS", FALSE );
+	gGameExternalOptions.usTankMinimumProgress				= iniReader.ReadInteger("Strategic Gameplay Settings", "TANK_MINIMUM_PROGRESS", 60, 0, 100);
 	gGameExternalOptions.usJeepMinimumProgress				= iniReader.ReadInteger( "Strategic Gameplay Settings", "JEEP_MINIMUM_PROGRESS", 30, 0, 100 );
-
-	gGameExternalOptions.fArmyUsesRobotsInAttacks			= iniReader.ReadBoolean( "Strategic Gameplay Settings", "ARMY_USES_ROBOTS_IN_ATTACKS", FALSE );
-	gGameExternalOptions.fArmyUsesRobotsInPatrols			= iniReader.ReadBoolean( "Strategic Gameplay Settings", "ARMY_USES_ROBOTS_IN_PATROLS", FALSE );
 	gGameExternalOptions.usRobotMinimumProgress				= iniReader.ReadInteger( "Strategic Gameplay Settings", "ROBOT_MINIMUM_PROGRESS", 45, 0, 100 );
 
 	// Kaiden: Vehicle Inventory change - Added INI file Option VEHICLE_INVENTORY
diff --git a/GameSettings.h b/GameSettings.h
index 5f357d055..81da06ad0 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -942,16 +942,8 @@ typedef struct
 	BOOLEAN fEnemiesDontSpareLaunchables;
 	BOOLEAN fEnemiesBlowObstaclesUp;
 
-	BOOLEAN fArmyUsesTanksInAttacks;
-	BOOLEAN fArmyUsesTanksInPatrols;
 	UINT8 usTankMinimumProgress;
-
-	BOOLEAN fArmyUsesJeepsInAttacks;
-	BOOLEAN fArmyUsesJeepsInPatrols;
 	UINT8 usJeepMinimumProgress;
-
-	BOOLEAN fArmyUsesRobotsInAttacks;
-	BOOLEAN fArmyUsesRobotsInPatrols;
 	UINT8 usRobotMinimumProgress;
 
 	// WANNE: Always use "prof.dat".
diff --git a/GameVersion.cpp b/GameVersion.cpp
index 25d89e2d2..3d3e1c419 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -55,8 +55,8 @@
 
 #endif
 										
-CHAR8		czVersionNumber[16]	= { "Build 21.04.04" };		//YY.MM.DD
+CHAR8		czVersionNumber[16]	= { "Build 21.04.26" };		//YY.MM.DD
 CHAR16		zTrackingNumber[16]	= { L"Z" };
-CHAR16		zRevisionNumber[16] = { L"Revision 8957" };
+CHAR16		zRevisionNumber[16] = { L"Revision 8980" };
 	
 // SAVE_GAME_VERSION is defined in header, change it there
diff --git a/Strategic/Strategic AI.cpp b/Strategic/Strategic AI.cpp
index 28982e53c..bf1044d2d 100644
--- a/Strategic/Strategic AI.cpp	
+++ b/Strategic/Strategic AI.cpp	
@@ -7056,24 +7056,18 @@ void InitializeGroup( const GROUP_TYPE groupType, const UINT8 groupSize, UINT8 &
 	
 	if ( asdUpgrade && groupSize > 0 )
 	{
-		const BOOLEAN canUpgradeToJeep = (groupType == GROUP_TYPE_ATTACK && gGameExternalOptions.fArmyUsesJeepsInAttacks)
-									|| (groupType == GROUP_TYPE_PATROL && gGameExternalOptions.fArmyUsesJeepsInPatrols);
-		const BOOLEAN canUpgradeToTank = (groupType == GROUP_TYPE_ATTACK && gGameExternalOptions.fArmyUsesTanksInAttacks)
-									|| (groupType == GROUP_TYPE_PATROL && gGameExternalOptions.fArmyUsesTanksInPatrols);
-		const BOOLEAN canUpgradeToRobot = (groupType == GROUP_TYPE_ATTACK && gGameExternalOptions.fArmyUsesRobotsInAttacks)
-									|| (groupType == GROUP_TYPE_PATROL && gGameExternalOptions.fArmyUsesRobotsInPatrols);
-		if ( canUpgradeToJeep && ASDSoldierUpgradeToJeep( ) )
+		if ( gGameExternalOptions.fASDAssignsJeeps && ASDSoldierUpgradeToJeep( ) )
 		{
 			troopCount--;
 			jeepCount++;
 		}
-		else if ( canUpgradeToTank && ASDSoldierUpgradeToTank( ) )
+		else if ( gGameExternalOptions.fASDAssignsTanks && ASDSoldierUpgradeToTank( ) )
 		{
 			troopCount--;
 			tankCount++;
 		}
 
-		if ( canUpgradeToRobot && ASDSoldierUpgradeToRobot() )
+		if ( gGameExternalOptions.fASDAssignsRobots && ASDSoldierUpgradeToRobot() )
 		{
 			const int numRobots = Random(difficultyMod);
 			troopCount -= numRobots;