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

Fix observer tooltips (Bug #769)

Browse Source
This commit is contained in:
Paul Chote
2011-06-21 02:51:50 +12:00
parent e33995d71b
commit ce65127e34
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -164,7 +164,7 @@ namespace OpenRA
orderManager.LastTickTime += Settings.Game.Timestep; orderManager.LastTickTime += Settings.Game.Timestep;
Widget.DoTick(); Widget.DoTick();
var world = orderManager.world; var world = orderManager.world;
if( orderManager.GameStarted && world.LocalPlayer != null ) if (orderManager.GameStarted)
++Viewport.TicksSinceLastMove; ++Viewport.TicksSinceLastMove;
Sound.Tick(); Sound.Tick();
Sync.CheckSyncUnchanged( world, () => { orderManager.TickImmediate(); } ); Sync.CheckSyncUnchanged( world, () => { orderManager.TickImmediate(); } );

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

@@ -29,13 +29,13 @@ namespace OpenRA.Mods.RA.Widgets
public override void DrawInner() public override void DrawInner()
{ {
if (Viewport.TicksSinceLastMove < TooltipDelay || world == null || world.LocalPlayer == null) if (Viewport.TicksSinceLastMove < TooltipDelay || world == null)
return; return;
var cell = Game.viewport.ViewToWorld(Viewport.LastMousePos).ToInt2(); var cell = Game.viewport.ViewToWorld(Viewport.LastMousePos).ToInt2();
if (!world.Map.IsInMap(cell)) return; if (!world.Map.IsInMap(cell)) return;
if (!world.LocalPlayer.Shroud.IsExplored(cell)) if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.IsExplored(cell))
{ {
var utext = "Unexplored Terrain"; var utext = "Unexplored Terrain";
var usz = Game.Renderer.Fonts["Bold"].Measure(utext) + new int2(20, 24); var usz = Game.Renderer.Fonts["Bold"].Measure(utext) + new int2(20, 24);