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

set editor to x86-only; editor loads rules

Browse Source
This commit is contained in:
Chris Forbes
2010-05-09 13:02:21 +12:00
parent 9332332771
commit e06b2dd9e6
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Editor/Form1.cs
View File

@@ -1,10 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using System.Drawing.Imaging;
namespace OpenRA.Editor namespace OpenRA.Editor
{ {
@@ -15,7 +15,7 @@ namespace OpenRA.Editor
InitializeComponent(); InitializeComponent();
LocateGameRoot(); LocateGameRoot();
LoadMap("cnc", "scm01ea"); LoadMap("ra", "scm01ea");
} }
void LoadMap(string mod, string mapname) void LoadMap(string mod, string mapname)
@@ -32,6 +32,9 @@ namespace OpenRA.Editor
// load the map // load the map
var map = new Map(new Folder("mods/{0}/maps/{1}".F(mod, mapname))); 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... // we're also going to need a tileset...
var tsinfo = fileMapping[Pair.New(mods[0], map.Theater)]; var tsinfo = fileMapping[Pair.New(mods[0], map.Theater)];
var tileset = new TileSet("tileset.til", "templates.ini", tsinfo.First); var tileset = new TileSet("tileset.til", "templates.ini", tsinfo.First);

5
OpenRA.Editor/OpenRA.Editor.csproj
View File

@@ -22,6 +22,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
@@ -87,6 +88,10 @@
<Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project> <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
<Name>OpenRA.FileFormats</Name> <Name>OpenRA.FileFormats</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
<Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
<Name>OpenRA.Game</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

2
OpenRA.Game/Game.cs
View File

@@ -73,7 +73,7 @@ namespace OpenRA
Timer.Time("mount temporary packages: {0}"); Timer.Time("mount temporary packages: {0}");
} }
static void LoadModAssemblies(Manifest m) public static void LoadModAssemblies(Manifest m)
{ {
// All the core namespaces // All the core namespaces
var asms = typeof(Game).Assembly.GetNamespaces() var asms = typeof(Game).Assembly.GetNamespaces()