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

remove many references to Game.world

Browse Source
This commit is contained in:
Bob
2010-10-11 02:44:16 +13:00
parent f8776d773d
commit 6a25d989a7
10 changed files with 88 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -19,7 +19,12 @@ namespace OpenRA.Widgets
{
class WorldInteractionControllerWidget : Widget
{
public WorldInteractionControllerWidget() : base() {}
readonly World world;
[ObjectCreator.UseCtor]
public WorldInteractionControllerWidget( [ObjectCreator.Param( "world" )] World world )
{
this.world = world;
}
public override void DrawInner( World world )
{
@@ -43,7 +48,6 @@ namespace OpenRA.Widgets
public override bool HandleInputInner(MouseInput mi)
{
var xy = Game.viewport.ViewToWorld(mi);
var world = Game.world;
if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Down)
{
dragStart = dragEnd = xy;
@@ -106,7 +110,6 @@ namespace OpenRA.Widgets
public override string GetCursor(int2 pos)
{
var world = Game.world;
return Sync.CheckSyncUnchanged( world, () =>
{
if (!world.GameHasStarted)
@@ -129,7 +132,7 @@ namespace OpenRA.Widgets
{
if (e.KeyName.Length == 1 && char.IsDigit(e.KeyName[0]))
{
Game.world.Selection.DoControlGroup(Game.world, e.KeyName[0] - '0', e.Modifiers);
world.Selection.DoControlGroup(world, e.KeyName[0] - '0', e.Modifiers);
return true;
}
@@ -144,7 +147,6 @@ namespace OpenRA.Widgets
public void GotoNextBase()
{
var world = Game.world;
var bases = world.Queries.OwnedBy[world.LocalPlayer].WithTrait<BaseBuilding>().ToArray();
if (!bases.Any()) return;