From a399e0b68289aa2dc52fe2f636ed467b1a3f4204 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Thu, 27 May 2010 21:13:35 +1200
Subject: [PATCH] strip 'locate game root' crap from game & editor; chrono both
 CAs

---
 OpenRA.Editor/Form1.cs                  | 12 ------------
 OpenRA.Game/Game.cs                     |  7 -------
 OpenRA.Mods.RA/DefaultShellmapScript.cs |  9 ++++++---
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index 48f6b5b2ab..39a875b5a5 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -37,7 +37,6 @@ namespace OpenRA.Editor
 		{
 			InitializeComponent();
 			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
-			LocateGameRoot();
 
 			currentMod = mods.FirstOrDefault() ?? "ra";
 
@@ -213,17 +212,6 @@ namespace OpenRA.Editor
 			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)
 		{
 			var template = ts.walk[n];
diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 77409a58af..9987455fdc 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -532,13 +532,6 @@ namespace OpenRA
 		internal static void Initialize(Settings settings)
 		{
 			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);
 			LobbyInfo.GlobalSettings.Mods = Settings.InitialMods;
diff --git a/OpenRA.Mods.RA/DefaultShellmapScript.cs b/OpenRA.Mods.RA/DefaultShellmapScript.cs
index decada2fa8..53963d6246 100644
--- a/OpenRA.Mods.RA/DefaultShellmapScript.cs
+++ b/OpenRA.Mods.RA/DefaultShellmapScript.cs
@@ -53,9 +53,12 @@ namespace OpenRA.Mods.RA
 		
 		int ticks = 0;
 		public void Tick(Actor self)
-		{
-			if (ticks == 250)
-				MapActors["pdox"].traits.Get<Chronosphere>().Teleport(MapActors["ca1"], new int2(90,70));
+		{
+			if (ticks == 250)
+			{
+				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)
 				MapActors["mslo1"].traits.Get<NukeSilo>().Attack(new int2(96,53));
 			if (ticks == 110)