mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
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
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user