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

add graceful handling of bogus actor types in import

Browse Source
This commit is contained in:
Chris Forbes
2011-02-28 22:36:23 +13:00
parent ea40cb015d
commit b878bde331
1 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Editor/LegacyMapImporter.cs
View File

@@ -365,6 +365,10 @@ namespace OpenRA.Editor
//Structures: num=owner,type,health,location,turret-facing,trigger //Structures: num=owner,type,health,location,turret-facing,trigger
//Units: num=owner,type,health,location,facing,action,trigger //Units: num=owner,type,health,location,facing,action,trigger
//Infantry: num=owner,type,health,location,subcell,action,facing,trigger //Infantry: num=owner,type,health,location,subcell,action,facing,trigger
try
{
var parts = s.Value.Split(','); var parts = s.Value.Split(',');
var loc = int.Parse(parts[3]); var loc = int.Parse(parts[3]);
if (parts[0] == "") if (parts[0] == "")
@@ -375,7 +379,7 @@ namespace OpenRA.Editor
Players.Add(parts[0]); Players.Add(parts[0]);
var stance = ActorStance.Stance.None; var stance = ActorStance.Stance.None;
switch(parts[5]) switch (parts[5])
{ {
case "Area Guard": case "Area Guard":
case "Guard": case "Guard":
@@ -411,8 +415,15 @@ namespace OpenRA.Editor
if (section == "INFANTRY") if (section == "INFANTRY")
actor.Add(new SubCellInit(int.Parse(parts[4]))); actor.Add(new SubCellInit(int.Parse(parts[4])));
Map.Actors.Value.Add("Actor" + ActorCount++,actor); if (!Rules.Info.ContainsKey(parts[1].ToLowerInvariant()))
errorHandler("Ignoring unknown actor type: `{0}`".F(parts[1].ToLowerInvariant()));
else
Map.Actors.Value.Add("Actor" + ActorCount++, actor);
}
catch (Exception)
{
errorHandler("Malformed actor definition: `{0}`".F(s));
}
} }
} }