From c9be0f44f45e12ca009a4490233ca44fe1e43c98 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 13 Mar 2011 00:39:37 +1300
Subject: [PATCH] spoilers: cursor dies

---
 OpenRA.Game/Cursor.cs            | 28 ----------------------------
 OpenRA.Game/Graphics/Viewport.cs |  8 ++++++--
 OpenRA.Game/OpenRA.Game.csproj   |  1 -
 3 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 OpenRA.Game/Cursor.cs

diff --git a/OpenRA.Game/Cursor.cs b/OpenRA.Game/Cursor.cs
deleted file mode 100644
index f08a900244..0000000000
--- a/OpenRA.Game/Cursor.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using OpenRA.Graphics;
-
-namespace OpenRA
-{
-	public class Cursor
-	{
-		CursorSequence sequence;
-		public Cursor(string cursor)
-		{
-			sequence = CursorProvider.GetCursorSequence(cursor);
-		}
-		
-		public void Draw(int frame, float2 pos)
-		{
-			sequence.GetSprite(frame).DrawAt(pos - sequence.Hotspot, Game.modData.Palette.GetPaletteIndex(sequence.Palette));
-		}
-	}
-}
diff --git a/OpenRA.Game/Graphics/Viewport.cs b/OpenRA.Game/Graphics/Viewport.cs
index 9a380d8208..1e45c10b93 100755
--- a/OpenRA.Game/Graphics/Viewport.cs
+++ b/OpenRA.Game/Graphics/Viewport.cs
@@ -86,8 +86,12 @@ namespace OpenRA.Graphics
 				wr.Draw();
 			
 			Widget.DoDraw();
-			var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default";
-			new Cursor(cursorName).Draw((int)cursorFrame, Viewport.LastMousePos + Location); 
+			var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default";
+            var cursorSequence = CursorProvider.GetCursorSequence(cursorName);
+
+            cursorSequence.GetSprite((int)cursorFrame).DrawAt(
+                Viewport.LastMousePos + Location - cursorSequence.Hotspot,
+                Game.modData.Palette.GetPaletteIndex(cursorSequence.Palette));
 
 			renderer.EndFrame( inputHandler );
 		}
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index fc48a7f449..7ae374b1bb 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -109,7 +109,6 @@
     <Compile Include="Traits\World\SpatialBins.cs" />
     <Compile Include="Traits\World\Country.cs" />
     <Compile Include="Actor.cs" />
-    <Compile Include="Cursor.cs" />
     <Compile Include="GameRules\Rules.cs" />
     <Compile Include="Graphics\Animation.cs" />
     <Compile Include="Game.cs" />