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

Merge pull request #5627 from pchote/frozen-cloak-fix

Browse Source 
Invalidate FrozenActors that don’t have any sprites.
This commit is contained in:
Matthias Mailänder
2014-06-14 11:41:49 +02:00
parent b3a2f81706 96477b7c1a
commit fe0d7ab00e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Traits/Player/FrozenActorLayer.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA.Traits
} }
public uint ID { get { return actor.ActorID; } } public uint ID { get { return actor.ActorID; } }
public bool IsValid { get { return Owner != null; } } public bool IsValid { get { return Owner != null && HasRenderables; } }
public ActorInfo Info { get { return actor.Info; } } public ActorInfo Info { get { return actor.Info; } }
public Actor Actor { get { return !actor.IsDead() ? actor : null; } } public Actor Actor { get { return !actor.IsDead() ? actor : null; } }
@@ -87,7 +87,7 @@ namespace OpenRA.Traits
return Renderables; return Renderables;
} }
public bool HasRenderables { get { return Renderables != null; } } public bool HasRenderables { get { return Renderables != null && Renderables.Any(); } }
public override string ToString() public override string ToString()
{ {

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

@@ -116,7 +116,7 @@ namespace OpenRA.Widgets
} }
var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, worldRenderer.Viewport.ViewToWorldPx(Viewport.LastMousePos)) var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, worldRenderer.Viewport.ViewToWorldPx(Viewport.LastMousePos))
.Where(a => a.TooltipName != null) .Where(a => a.TooltipName != null && a.IsValid)
.WithHighestSelectionPriority(); .WithHighestSelectionPriority();
if (frozen != null) if (frozen != null)