Remove runtime mod merging. Closes #3421.

This commit is contained in:
Paul Chote
2013-10-06 12:44:20 +13:00
parent 4d893cb1f2
commit 6d6d1e230b
35 changed files with 143 additions and 186 deletions

View File

@@ -35,7 +35,7 @@ namespace OpenRA.Lint
try
{
var options = args.Where(a => a.StartsWith("-"));
var mods = args.Where(a => !options.Contains(a)).ToArray();
var mod = args.Where(a => !options.Contains(a)).First();
var verbose = options.Contains("-v") || options.Contains("--verbose");
@@ -44,7 +44,7 @@ namespace OpenRA.Lint
FieldLoader.UnknownFieldAction = (s, f) => EmitError("FieldLoader: Missing field `{0}` on `{1}`".F(s, f.Name));
AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
Game.modData = new ModData(mods);
Game.modData = new ModData(mod);
Rules.LoadRules(Game.modData.Manifest, new Map());
foreach (var customPassType in Game.modData.ObjectCreator