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

don't pass world to Widget.Tick, either

Browse Source
This commit is contained in:
Bob
2010-10-11 20:21:15 +13:00
parent e0afc08e5f
commit 0873741983
9 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -112,7 +112,7 @@ namespace OpenRA
using (new PerfSample("tick_time")) using (new PerfSample("tick_time"))
{ {
lastTime += Settings.Game.Timestep; lastTime += Settings.Game.Timestep;
Widget.DoTick(world); Widget.DoTick();
if( world.GameHasStarted && world.LocalPlayer != null ) if( world.GameHasStarted && world.LocalPlayer != null )
++Viewport.TicksSinceLastMove; ++Viewport.TicksSinceLastMove;
Sound.Tick(); Sound.Tick();

2
OpenRA.Game/Widgets/ChatDisplayWidget.cs
View File

@@ -75,7 +75,7 @@ namespace OpenRA.Widgets
recentLines = new List<ChatLine>(); recentLines = new List<ChatLine>();
} }
public override void Tick (World world) public override void Tick()
{ {
if (RemoveTime == 0) return; if (RemoveTime == 0) return;
if (--ticksUntilRemove > 0) return; if (--ticksUntilRemove > 0) return;

2
OpenRA.Game/Widgets/ListBoxWidget.cs
View File

@@ -86,7 +86,7 @@ namespace OpenRA.Widgets
return EventBounds; return EventBounds;
} }
public override void Tick (World world) public override void Tick ()
{ {
if (UpPressed && ListOffset <= 0) ListOffset += ScrollVelocity; if (UpPressed && ListOffset <= 0) ListOffset += ScrollVelocity;
if (DownPressed) ListOffset -= ScrollVelocity; if (DownPressed) ListOffset -= ScrollVelocity;

2
OpenRA.Game/Widgets/ScrollingTextWidget.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Widgets
GetBackground = other.GetBackground; GetBackground = other.GetBackground;
} }
public override void Tick(World world) public override void Tick()
{ {
if (Text != "") if (Text != "")
{ {

4
OpenRA.Game/Widgets/TextFieldWidget.cs
View File

@@ -97,14 +97,14 @@ namespace OpenRA.Widgets
int blinkCycle = 10; int blinkCycle = 10;
bool showCursor = true; bool showCursor = true;
public override void Tick(World world) public override void Tick()
{ {
if (--blinkCycle <= 0) if (--blinkCycle <= 0)
{ {
blinkCycle = 20; blinkCycle = 20;
showCursor ^= true; showCursor ^= true;
} }
base.Tick(world); base.Tick();
} }
public override void DrawInner() public override void DrawInner()

2
OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs
View File

@@ -122,7 +122,7 @@ namespace OpenRA.Widgets
return false; return false;
} }
public override void Tick(World world) public override void Tick()
{ {
Edge = ScrollDirection.None; Edge = ScrollDirection.None;
if (Game.Settings.Game.ViewportEdgeScroll && Game.HasInputFocus) if (Game.Settings.Game.ViewportEdgeScroll && Game.HasInputFocus)

8
OpenRA.Game/Widgets/Widget.cs
View File

@@ -281,11 +281,11 @@ namespace OpenRA.Widgets
} }
} }
public virtual void Tick(World world) public virtual void Tick()
{ {
if (IsVisible()) if (IsVisible())
foreach (var child in Children) foreach (var child in Children)
child.Tick(world); child.Tick();
} }
public void AddChild(Widget child) public void AddChild(Widget child)
@@ -335,9 +335,9 @@ namespace OpenRA.Widgets
return window; return window;
} }
public static void DoTick(World world) public static void DoTick()
{ {
RootWidget.Tick(world); RootWidget.Tick();
} }
public static void DoDraw() public static void DoDraw()

4
OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.RA.Widgets
get { return new Rectangle((int)(paletteOrigin.X) - 24, (int)(paletteOrigin.Y), 215, 48 * numActualRows); } get { return new Rectangle((int)(paletteOrigin.X) - 24, (int)(paletteOrigin.Y), 215, 48 * numActualRows); }
} }
public override void Tick(World world) public override void Tick()
{ {
VisibleQueues.Clear(); VisibleQueues.Clear();
@@ -101,7 +101,7 @@ namespace OpenRA.Mods.RA.Widgets
TickPaletteAnimation(world); TickPaletteAnimation(world);
base.Tick(world); base.Tick();
} }
void TickPaletteAnimation(World world) void TickPaletteAnimation(World world)

7
OpenRA.Mods.RA/Widgets/RadarBinWidget.cs
View File

@@ -121,7 +121,7 @@ namespace OpenRA.Mods.RA.Widgets
public override void DrawInner() public override void DrawInner()
{ {
if( world.LocalPlayer == null ) return; if( world == null || world.LocalPlayer == null ) return;
radarCollection = "radar-" + world.LocalPlayer.Country.Race; radarCollection = "radar-" + world.LocalPlayer.Country.Race;
@@ -155,13 +155,12 @@ namespace OpenRA.Mods.RA.Widgets
Game.Renderer.DisableScissor(); Game.Renderer.DisableScissor();
} }
} }
} }
int updateTicks = 0; int updateTicks = 0;
public override void Tick(World w) public override void Tick()
{ {
var w = Game.world;
if( world != w ) if( world != w )
SetWorld( w ); SetWorld( w );