Map ctor no longer assumes anything about mods (fixes cnc custom-map crash)

This commit is contained in:
Paul Chote
2010-07-17 12:03:25 +12:00
parent 239fff20f4
commit 9875a968bc
4 changed files with 4 additions and 9 deletions

View File

@@ -92,9 +92,6 @@ namespace OpenRA.FileFormats
TopLeft = new int2(0, 0);
BottomRight = new int2(0, 0);
Tileset = "TEMPERAT";
Players.Add("Neutral", new PlayerReference("Neutral", "neutral", "allies", true, true));
Title = "Name your map here";
Description = "Describe your map here";
Author = "Your name here";
@@ -118,7 +115,7 @@ namespace OpenRA.FileFormats
// Players
if (MapFormat == 1)
{
Players.Add("Neutral", new PlayerReference("Neutral", "neutral", "allies", true, true));
Players.Add("Neutral", new PlayerReference("Neutral", "allies", true, true));
}
else
{

View File

@@ -36,10 +36,9 @@ namespace OpenRA.FileFormats
FieldLoader.Load(this, my);
}
public PlayerReference(string name, string palette, string race, bool ownsworld, bool noncombatant)
public PlayerReference(string name, string race, bool ownsworld, bool noncombatant)
{
Name = name;
Palette = palette;
Race = race;
OwnsWorld = ownsworld;
NonCombatant = noncombatant;