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

fix editor init

Browse Source
This commit is contained in:
Chris Forbes
2011-01-28 18:37:00 +13:00
parent add5c0ee6d
commit 1e241ebd56
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Editor/Form1.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Editor
InitializeComponent(); InitializeComponent();
AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly; AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
var currentMod = mods.FirstOrDefault() ?? "ra"; currentMod = mods.FirstOrDefault() ?? "ra";
toolStripComboBox1.Items.AddRange(Mod.AllMods.Keys.ToArray()); toolStripComboBox1.Items.AddRange(Mod.AllMods.Keys.ToArray());
@@ -47,6 +47,7 @@ namespace OpenRA.Editor
Text = "OpenRA Editor (mod:{0})".F(currentMod); Text = "OpenRA Editor (mod:{0})".F(currentMod);
Game.modData = new ModData(currentMod); Game.modData = new ModData(currentMod);
FileSystem.LoadFromManifest(Game.modData.Manifest);
Rules.LoadRules(Game.modData.Manifest, new Map()); Rules.LoadRules(Game.modData.Manifest, new Map());
loadedMapName = null; loadedMapName = null;
}; };
@@ -77,8 +78,6 @@ namespace OpenRA.Editor
loadedMapName = mapname; loadedMapName = mapname;
Game.modData = new ModData(currentMod);
// load the map // load the map
var map = new Map(mapname); var map = new Map(mapname);
@@ -100,9 +99,6 @@ namespace OpenRA.Editor
resourcePalette.Controls.Clear(); resourcePalette.Controls.Clear();
loadedMapName = null; loadedMapName = null;
Game.modData = new ModData(currentMod);
PrepareMapResources(Game.modData.Manifest, map); PrepareMapResources(Game.modData.Manifest, map);
MakeDirty(); MakeDirty();