From e06b2dd9e64a3740bb4539ab49c139be72a43d1f Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 9 May 2010 13:02:21 +1200
Subject: [PATCH] set editor to x86-only; editor loads rules

---
 OpenRA.Editor/Form1.cs             | 7 +++++--
 OpenRA.Editor/OpenRA.Editor.csproj | 5 +++++
 OpenRA.Game/Game.cs                | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index 31dd15a543..89eacfbd78 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Windows.Forms;
 using OpenRA.FileFormats;
-using System.Drawing.Imaging;
 
 namespace OpenRA.Editor
 {
@@ -15,7 +15,7 @@ namespace OpenRA.Editor
 			InitializeComponent();
 			LocateGameRoot();
 
-			LoadMap("cnc", "scm01ea");
+			LoadMap("ra", "scm01ea");
 		}
 
 		void LoadMap(string mod, string mapname)
@@ -32,6 +32,9 @@ namespace OpenRA.Editor
 			// load the map
 			var map = new Map(new Folder("mods/{0}/maps/{1}".F(mod, mapname)));
 
+			Game.LoadModAssemblies(manifest);
+			Rules.LoadRules(manifest, map);
+
 			// we're also going to need a tileset...
 			var tsinfo = fileMapping[Pair.New(mods[0], map.Theater)];
 			var tileset = new TileSet("tileset.til", "templates.ini", tsinfo.First);
diff --git a/OpenRA.Editor/OpenRA.Editor.csproj b/OpenRA.Editor/OpenRA.Editor.csproj
index ad02cc1247..46218f5c08 100644
--- a/OpenRA.Editor/OpenRA.Editor.csproj
+++ b/OpenRA.Editor/OpenRA.Editor.csproj
@@ -22,6 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -87,6 +88,10 @@
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
       <Name>OpenRA.FileFormats</Name>
     </ProjectReference>
+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
+      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
+      <Name>OpenRA.Game</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index ff2d1b8916..3b3e033594 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -73,7 +73,7 @@ namespace OpenRA
 			Timer.Time("mount temporary packages: {0}");
 		}
 		
-		static void LoadModAssemblies(Manifest m)
+		public static void LoadModAssemblies(Manifest m)
 		{	
 			// All the core namespaces
 			var asms = typeof(Game).Assembly.GetNamespaces()