diff --git a/OpenRA.Game/Chrome.cs b/OpenRA.Game/Chrome.cs index 7e70f5bf88..45616104dc 100644 --- a/OpenRA.Game/Chrome.cs +++ b/OpenRA.Game/Chrome.cs @@ -129,7 +129,7 @@ namespace OpenRA public void Tick(World world) { - if (!Game.IsStarted) return; + if (!world.GameHasStarted) return; if (world.LocalPlayer == null) return; TickPaletteAnimation(); diff --git a/OpenRA.Game/Controller.cs b/OpenRA.Game/Controller.cs index 3b40601c12..9fc4402b15 100644 --- a/OpenRA.Game/Controller.cs +++ b/OpenRA.Game/Controller.cs @@ -125,7 +125,7 @@ namespace OpenRA try { - if (!Game.IsStarted) + if (!world.GameHasStarted) return "default"; var mi = new MouseInput diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index b9d5e26c1e..c6dfe0a37f 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -318,7 +318,7 @@ namespace OpenRA LobbyInfo = session; - if (!IsStarted) + if (!world.GameHasStarted) world.SharedRandom = new OpenRA.Thirdparty.Random(LobbyInfo.GlobalSettings.RandomSeed); if (Game.orderManager.Connection.ConnectionState == ConnectionState.Connected) @@ -347,8 +347,6 @@ namespace OpenRA public static void IssueOrder(Order o) { orderManager.IssueOrder(o); } /* avoid exposing the OM to mod code */ - public static bool IsStarted { get { return orderManager.GameStarted; } } - public static void LoadShellMap(string map) { LoadMap(map); diff --git a/OpenRA.Game/Graphics/Minimap.cs b/OpenRA.Game/Graphics/Minimap.cs index 9bea10e6e1..c8553d6a80 100644 --- a/OpenRA.Game/Graphics/Minimap.cs +++ b/OpenRA.Game/Graphics/Minimap.cs @@ -125,7 +125,7 @@ namespace OpenRA.Graphics mapOnlySheet.Texture.SetData(oreLayer); - if (!Game.IsStarted || !world.Queries.OwnedBy[world.LocalPlayer].WithTrait().Any()) + if (!world.GameHasStarted || !world.Queries.OwnedBy[world.LocalPlayer].WithTrait().Any()) return; var bitmap = new Bitmap(oreLayer); diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs index a1e52373a1..1f52c369f6 100644 --- a/OpenRA.Game/World.cs +++ b/OpenRA.Game/World.cs @@ -46,6 +46,8 @@ namespace OpenRA public void AddPlayer(Player p) { players[p.Index] = p; } + public bool GameHasStarted { get { return Game.orderManager.GameStarted; } } + int localPlayerIndex; public Player LocalPlayer {