diff --git a/OpenRA.Game/Chrome.cs b/OpenRA.Game/Chrome.cs index 3ce6b5626a..920b41e930 100644 --- a/OpenRA.Game/Chrome.cs +++ b/OpenRA.Game/Chrome.cs @@ -142,6 +142,8 @@ namespace OpenRA public void Tick(World world) { + if (!Game.IsStarted) return; + TickPaletteAnimation(); TickRadarAnimation(); diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 1a5b3808e3..309bff52b4 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -262,19 +262,21 @@ 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 StartGame() { - if( Game.orderManager.GameStarted ) return; - Game.chat.Reset(); + if( orderManager.GameStarted ) return; + chat.Reset(); // todo: only spawn a neutral player + a player for each client for (int i = 0; i < 8; i++) world.players[i] = new Player(world, i, LobbyInfo.Clients.FirstOrDefault(a => a.Index == i)); - foreach (var gs in Game.world.WorldActor.traits.WithInterface()) + foreach (var gs in world.WorldActor.traits.WithInterface()) gs.GameStarted(world); - Game.viewport.GoToStartLocation( Game.world.LocalPlayer ); + Game.viewport.GoToStartLocation( world.LocalPlayer ); orderManager.StartGame(); } diff --git a/settings-netplay-ra.ini b/settings-netplay-ra.ini index be73876bc4..e08a811e2f 100644 --- a/settings-netplay-ra.ini +++ b/settings-netplay-ra.ini @@ -1,4 +1,7 @@ [Settings] NetworkHost=localhost NetworkPort=1234 -InitialMods=ra \ No newline at end of file +InitialMods=ra +Width=800 +Height=600 +Fullscreen=no \ No newline at end of file