Resolve assembly paths before loading the FileSystem.

2017-05-01 15:27:42 +00:00
parent f0d7a6caca
commit 248c12827e
3 changed files with 45 additions and 19 deletions
--- a/OpenRA.Game/ModData.cs
+++ b/OpenRA.Game/ModData.cs
@@ -49,13 +49,13 @@ namespace OpenRA
 		{
 			Languages = new string[0];

-			ModFiles = new FS(mods);

 			// Take a local copy of the manifest
 			Manifest = new Manifest(mod.Id, mod.Package);
-			ModFiles.LoadFromManifest(Manifest);
+			ObjectCreator = new ObjectCreator(Manifest, mods);

-			ObjectCreator = new ObjectCreator(Manifest, ModFiles);
+			ModFiles = new FS(mods);
+			ModFiles.LoadFromManifest(Manifest);
 			Manifest.LoadCustomData(ObjectCreator);

 			if (useLoadScreen)