1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

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).

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-04-26 05:41:23 +00:00
parent a28f18cd15
commit 78d73cc221
4 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+1 -9
View File
@@ -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
GameSettings.h
-8
View File
@@ -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".
GameVersion.cpp
+2 -2
View File
@@ -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
Strategic/Strategic AI.cpp
+3 -9
View File
@@ -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;