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

catch map load failures

Browse Source
This commit is contained in:
Chris Forbes
2011-08-20 14:13:52 +12:00
parent a9d25b603c
commit 1fe5c1d60f
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Game/ModData.cs
View File

@@ -8,6 +8,7 @@
*/ */
#endregion #endregion
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@@ -105,14 +106,19 @@ namespace OpenRA
var paths = mods.SelectMany(p => FindMapsIn("mods{0}{1}{0}maps{0}".F(Path.DirectorySeparatorChar, p))) var paths = mods.SelectMany(p => FindMapsIn("mods{0}{1}{0}maps{0}".F(Path.DirectorySeparatorChar, p)))
.Concat(mods.SelectMany(p => FindMapsIn("{1}maps{0}{2}{0}".F(Path.DirectorySeparatorChar, Platform.SupportDir, p)))); .Concat(mods.SelectMany(p => FindMapsIn("{1}maps{0}{2}{0}".F(Path.DirectorySeparatorChar, Platform.SupportDir, p))));
Dictionary<string, Map> ret = new Dictionary<string, Map>(); var ret = new Dictionary<string, Map>();
foreach (var path in paths) foreach (var path in paths)
{ {
var map = new Map(path); try
if (ret.ContainsKey(map.Uid)) {
System.Console.WriteLine("Ignoring duplicate map: {0}", path); var map = new Map(path);
else
ret.Add(map.Uid, map); ret.Add(map.Uid, map);
}
catch(Exception e)
{
Console.WriteLine("Failed to load map: {0}", path);
Console.WriteLine("Details: {0}", e.ToString());
}
} }
return ret; return ret;
} }