Remove obsolete DefaultStartingUnits parameter.

It was only actually used by bomber-john. Everything
else also removed SpawnMPUnits, making it redundant.
This commit is contained in:
Paul Chote
2013-07-12 21:21:41 +12:00
parent d3110bd114
commit db22f3568d
4 changed files with 2 additions and 9 deletions

View File

@@ -21,8 +21,7 @@ namespace OpenRA.FileFormats
public bool NonCombatant = false;
public bool Playable = false;
public string Bot = null;
public bool DefaultStartingUnits = false;
public string StartingUnitsClass;
public string StartingUnitsClass = null;
public bool AllowBots = true;
public bool Required = false;

View File

@@ -393,7 +393,6 @@ namespace OpenRA
Name = "Multi{0}".F(index),
Race = "Random",
Playable = true,
DefaultStartingUnits = true,
Enemies = new[] { "Creeps" }
};
Players.Add(p.Name, p);

View File

@@ -29,10 +29,6 @@ namespace OpenRA.Mods.RA
void SpawnUnitsForPlayer(World w, Player p, CPos sp)
{
// They don't want a MCV - the map provides something else for them
if (!p.PlayerReference.DefaultStartingUnits)
return;
var spawnClass = p.PlayerReference.StartingUnitsClass ?? w.LobbyInfo.GlobalSettings.StartingUnitsClass;
var unitGroup = Rules.Info["world"].Traits.WithInterface<MPStartUnitsInfo>()
.Where(g => g.Class == spawnClass && g.Races != null && g.Races.Contains(p.Country.Race))

View File

@@ -759,8 +759,7 @@ Smudges:
Rules:
World:
-CrateDrop:
SpawnMPUnits:
InitialUnit: mnlyr
-SpawnMPUnits:
APWR:
Buildable: