From db22f3568d19d50aa3bc349a16149ffa88b2282a Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 12 Jul 2013 21:21:41 +1200 Subject: [PATCH] Remove obsolete DefaultStartingUnits parameter. It was only actually used by bomber-john. Everything else also removed SpawnMPUnits, making it redundant. --- OpenRA.FileFormats/Map/PlayerReference.cs | 3 +-- OpenRA.Game/Map.cs | 1 - OpenRA.Mods.RA/SpawnMPUnits.cs | 4 ---- mods/ra/maps/bomber-john/map.yaml | 3 +-- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/OpenRA.FileFormats/Map/PlayerReference.cs b/OpenRA.FileFormats/Map/PlayerReference.cs index 55771b553a..d773161ba8 100644 --- a/OpenRA.FileFormats/Map/PlayerReference.cs +++ b/OpenRA.FileFormats/Map/PlayerReference.cs @@ -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; diff --git a/OpenRA.Game/Map.cs b/OpenRA.Game/Map.cs index 9b532ecedf..5ea42c752f 100644 --- a/OpenRA.Game/Map.cs +++ b/OpenRA.Game/Map.cs @@ -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); diff --git a/OpenRA.Mods.RA/SpawnMPUnits.cs b/OpenRA.Mods.RA/SpawnMPUnits.cs index afb31521a5..e7c093b591 100644 --- a/OpenRA.Mods.RA/SpawnMPUnits.cs +++ b/OpenRA.Mods.RA/SpawnMPUnits.cs @@ -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() .Where(g => g.Class == spawnClass && g.Races != null && g.Races.Contains(p.Country.Race)) diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index ed51811886..fdf8001184 100644 --- a/mods/ra/maps/bomber-john/map.yaml +++ b/mods/ra/maps/bomber-john/map.yaml @@ -759,8 +759,7 @@ Smudges: Rules: World: -CrateDrop: - SpawnMPUnits: - InitialUnit: mnlyr + -SpawnMPUnits: APWR: Buildable: