epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete DefaultStartingUnits parameter.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.FileFormats/Map/PlayerReference.cs
View File

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

1
OpenRA.Game/Map.cs
View File

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

4
OpenRA.Mods.RA/SpawnMPUnits.cs
View File

@@ -29,10 +29,6 @@ namespace OpenRA.Mods.RA
void SpawnUnitsForPlayer(World w, Player p, CPos sp) 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 spawnClass = p.PlayerReference.StartingUnitsClass ?? w.LobbyInfo.GlobalSettings.StartingUnitsClass;
var unitGroup = Rules.Info["world"].Traits.WithInterface<MPStartUnitsInfo>() var unitGroup = Rules.Info["world"].Traits.WithInterface<MPStartUnitsInfo>()
.Where(g => g.Class == spawnClass && g.Races != null && g.Races.Contains(p.Country.Race)) .Where(g => g.Class == spawnClass && g.Races != null && g.Races.Contains(p.Country.Race))

3
mods/ra/maps/bomber-john/map.yaml
View File

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