From efda804a41f39fd75f629e59debd312a6d5d11e6 Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 18 Jan 2010 03:27:37 +1300 Subject: [PATCH] fixing crap perf while viewing the lobby. --- OpenRa.Game/Chrome.cs | 8 ++------ OpenRa.Game/Graphics/Viewport.cs | 11 +++++++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/OpenRa.Game/Chrome.cs b/OpenRa.Game/Chrome.cs index 39059379f5..b45eb6b6a6 100644 --- a/OpenRa.Game/Chrome.cs +++ b/OpenRa.Game/Chrome.cs @@ -148,12 +148,6 @@ namespace OpenRa { DrawDownloadBar(); - if (!Game.orderManager.GameStarted) - { - DrawLobby(); - return; - } - chromeCollection = (Game.LocalPlayer.Race == Race.Allies) ? "chrome-allies" : "chrome-soviet"; radarCollection = (Game.LocalPlayer.Race == Race.Allies) ? "radar-allies" : "radar-soviet"; paletteCollection = (Game.LocalPlayer.Race == Race.Allies) ? "palette-allies" : "palette-soviet"; @@ -218,6 +212,8 @@ namespace OpenRa public void DrawLobby() { + DrawDownloadBar(); + var w = 800; var h = 600; var r = new Rectangle( (Game.viewport.Width - w) / 2, (Game.viewport.Height - h) / 2, w, h ); diff --git a/OpenRa.Game/Graphics/Viewport.cs b/OpenRa.Game/Graphics/Viewport.cs index f7f5c64223..ca6a1546aa 100644 --- a/OpenRa.Game/Graphics/Viewport.cs +++ b/OpenRa.Game/Graphics/Viewport.cs @@ -48,8 +48,15 @@ namespace OpenRa.Graphics renderer.BeginFrame(r1, r2, scrollPosition); - Game.world.WorldRenderer.Draw(); - Game.chrome.Draw(); + if( Game.orderManager.GameStarted ) + { + Game.world.WorldRenderer.Draw(); + Game.chrome.Draw(); + } + else + { + Game.chrome.DrawLobby(); + } var c = Game.chrome.HitTest(mousePos) ? Cursor.Default : Game.controller.ChooseCursor(); cursorRenderer.DrawSprite(c.GetSprite((int)cursorFrame), mousePos + Location - c.GetHotspot(), 0);