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

strip 'locate game root' crap from game & editor; chrono both CAs

Browse Source
This commit is contained in:
Chris Forbes
2010-05-27 21:13:35 +12:00
parent ce9f7666b4
commit a399e0b682
3 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Editor/Form1.cs
View File

@@ -37,7 +37,6 @@ namespace OpenRA.Editor
{ {
InitializeComponent(); InitializeComponent();
AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly; AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
LocateGameRoot();
currentMod = mods.FirstOrDefault() ?? "ra"; currentMod = mods.FirstOrDefault() ?? "ra";
@@ -213,17 +212,6 @@ namespace OpenRA.Editor
foreach (var p in palettes) { p.Visible = true; p.ResumeLayout(); } foreach (var p in palettes) { p.Visible = true; p.ResumeLayout(); }
} }
void LocateGameRoot()
{
while (!Directory.Exists("mods"))
{
var current = Directory.GetCurrentDirectory();
if (Directory.GetDirectoryRoot(current) == current)
throw new InvalidOperationException("Unable to find game root.");
Directory.SetCurrentDirectory("..");
}
}
static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p) static Bitmap RenderTemplate(TileSet ts, ushort n, Palette p)
{ {
var template = ts.walk[n]; var template = ts.walk[n];

7
OpenRA.Game/Game.cs
View File

@@ -532,13 +532,6 @@ namespace OpenRA
internal static void Initialize(Settings settings) internal static void Initialize(Settings settings)
{ {
AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly; AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
while (!Directory.Exists("mods"))
{
var current = Directory.GetCurrentDirectory();
if (Directory.GetDirectoryRoot(current) == current)
throw new InvalidOperationException("Unable to find game root.");
Directory.SetCurrentDirectory("..");
}
LoadUserSettings(settings); LoadUserSettings(settings);
LobbyInfo.GlobalSettings.Mods = Settings.InitialMods; LobbyInfo.GlobalSettings.Mods = Settings.InitialMods;

9
OpenRA.Mods.RA/DefaultShellmapScript.cs
View File

@@ -53,9 +53,12 @@ namespace OpenRA.Mods.RA
int ticks = 0; int ticks = 0;
public void Tick(Actor self) public void Tick(Actor self)
{ {
if (ticks == 250) if (ticks == 250)
MapActors["pdox"].traits.Get<Chronosphere>().Teleport(MapActors["ca1"], new int2(90,70)); {
MapActors["pdox"].traits.Get<Chronosphere>().Teleport(MapActors["ca1"], new int2(90, 70));
MapActors["pdox"].traits.Get<Chronosphere>().Teleport(MapActors["ca2"], new int2(92, 71));
}
if (ticks == 100) if (ticks == 100)
MapActors["mslo1"].traits.Get<NukeSilo>().Attack(new int2(96,53)); MapActors["mslo1"].traits.Get<NukeSilo>().Attack(new int2(96,53));
if (ticks == 110) if (ticks == 110)