epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removing more dumb stuff

Browse Source
This commit is contained in:
Chris Forbes
2009-12-05 12:39:58 +13:00
parent 3228f47962
commit d34d4d3e66
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRa.Game/Game.cs
View File

@@ -208,7 +208,6 @@ namespace OpenRa.Game
using (new PerfSample("render")) using (new PerfSample("render"))
{ {
++RenderFrame; ++RenderFrame;
viewport.cursor = controller.ChooseCursor();
viewport.DrawRegions(); viewport.DrawRegions();
} }

3
OpenRa.Game/Graphics/Viewport.cs
View File

@@ -20,7 +20,6 @@ namespace OpenRa.Game.Graphics
public int Width { get { return (int)screenSize.X; } } public int Width { get { return (int)screenSize.X; } }
public int Height { get { return (int)screenSize.Y; } } public int Height { get { return (int)screenSize.Y; } }
public Cursor cursor = Cursor.Move;
SpriteRenderer cursorRenderer; SpriteRenderer cursorRenderer;
int2 mousePos; int2 mousePos;
float cursorFrame = 0f; float cursorFrame = 0f;
@@ -51,7 +50,7 @@ namespace OpenRa.Game.Graphics
Game.worldRenderer.Draw(); Game.worldRenderer.Draw();
Game.chrome.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.DrawSprite(c.GetSprite((int)cursorFrame), mousePos + Location - c.GetHotspot(), 0);
cursorRenderer.Flush(); cursorRenderer.Flush();