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

Fixes NullPointerException when frozen.Actor is null.

Browse Source
This commit is contained in:
WolfGaming
2015-03-07 21:09:29 +00:00
parent d2f02e7a4b
commit 068a96fd46
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,7 @@ namespace OpenRA.Widgets
public void UpdateMouseover() public void UpdateMouseover()
{ {
TooltipType = WorldTooltipType.None; TooltipType = WorldTooltipType.None;
ActorTooltipExtra = null;
var cell = worldRenderer.Viewport.ViewToWorld(Viewport.LastMousePos); var cell = worldRenderer.Viewport.ViewToWorld(Viewport.LastMousePos);
if (!world.Map.Contains(cell)) if (!world.Map.Contains(cell))
return; return;
@@ -122,7 +123,8 @@ namespace OpenRA.Widgets
if (frozen != null) if (frozen != null)
{ {
FrozenActorTooltip = frozen; FrozenActorTooltip = frozen;
ActorTooltipExtra = frozen.Actor.TraitsImplementing<IProvideTooltipInfo>(); if (frozen.Actor != null)
ActorTooltipExtra = frozen.Actor.TraitsImplementing<IProvideTooltipInfo>();
TooltipType = WorldTooltipType.FrozenActor; TooltipType = WorldTooltipType.FrozenActor;
} }
} }