From d34d4d3e66031610abbc7d687990f53f12bbe69a Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 5 Dec 2009 12:39:58 +1300 Subject: [PATCH] removing more dumb stuff --- OpenRa.Game/Game.cs | 1 - OpenRa.Game/Graphics/Viewport.cs | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs index f58d367156..e8685ab72d 100644 --- a/OpenRa.Game/Game.cs +++ b/OpenRa.Game/Game.cs @@ -208,7 +208,6 @@ namespace OpenRa.Game using (new PerfSample("render")) { ++RenderFrame; - viewport.cursor = controller.ChooseCursor(); viewport.DrawRegions(); } diff --git a/OpenRa.Game/Graphics/Viewport.cs b/OpenRa.Game/Graphics/Viewport.cs index aac2312273..148736fec8 100644 --- a/OpenRa.Game/Graphics/Viewport.cs +++ b/OpenRa.Game/Graphics/Viewport.cs @@ -20,7 +20,6 @@ namespace OpenRa.Game.Graphics public int Width { get { return (int)screenSize.X; } } public int Height { get { return (int)screenSize.Y; } } - public Cursor cursor = Cursor.Move; SpriteRenderer cursorRenderer; int2 mousePos; float cursorFrame = 0f; @@ -51,7 +50,7 @@ namespace OpenRa.Game.Graphics Game.worldRenderer.Draw(); Game.chrome.Draw(); - var c = Game.chrome.HitTest(mousePos) ? Cursor.Default : cursor; + var c = Game.chrome.HitTest(mousePos) ? Cursor.Default : Game.controller.ChooseCursor(); cursorRenderer.DrawSprite(c.GetSprite((int)cursorFrame), mousePos + Location - c.GetHotspot(), 0); cursorRenderer.Flush();