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

more refs to Game.world (Controller)

Browse Source
This commit is contained in:
Bob
2010-01-21 13:57:44 +13:00
parent b3911db149
commit 698985c30c
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ namespace OpenRa.Graphics
{
interface IHandleInput
{
bool HandleInput(MouseInput mi);
bool HandleInput(World world, MouseInput mi);
}
class Viewport
@@ -85,7 +85,7 @@ namespace OpenRa.Graphics
Game.chrome.DrawLobby( world );
}
var c = Game.chrome.HitTest(mousePos) ? Cursor.Default : Game.controller.ChooseCursor();
var c = Game.chrome.HitTest(mousePos) ? Cursor.Default : Game.controller.ChooseCursor( world );
cursorRenderer.DrawSprite(c.GetSprite((int)cursorFrame), mousePos + Location - c.GetHotspot(), 0);
cursorRenderer.Flush();
@@ -98,18 +98,18 @@ namespace OpenRa.Graphics
}
IHandleInput dragRegion = null;
public void DispatchMouseInput(MouseInput mi)
public void DispatchMouseInput(World world, MouseInput mi)
{
if (mi.Event == MouseInputEvent.Move)
mousePos = mi.Location;
if (dragRegion != null) {
dragRegion.HandleInput( mi );
dragRegion.HandleInput( world, mi );
if (mi.Event == MouseInputEvent.Up) dragRegion = null;
return;
}
dragRegion = regions.FirstOrDefault(r => r.HandleInput(mi));
dragRegion = regions.FirstOrDefault(r => r.HandleInput(world, mi));
if (mi.Event != MouseInputEvent.Down)
dragRegion = null;
}