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

Merge pull request #12046 from obrakmann/fix11996_spy-exodus-crash

Browse Source 
Fix crashing when a spy's "real" owner gets changed
This commit is contained in:
Paul Chote
2016-09-20 09:15:20 +01:00
committed by GitHub
parent 8fabd6cff1 a4a726c19a
commit 095b093f39
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs
View File

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.Traits.Render
Color GetColor() Color GetColor()
{ {
return self.EffectiveOwner != null ? self.EffectiveOwner.Owner.Color.RGB : self.Owner.Color.RGB; return self.EffectiveOwner != null && self.EffectiveOwner.Disguised ? self.EffectiveOwner.Owner.Color.RGB : self.Owner.Color.RGB;
} }
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr) IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)

6
mods/ra/maps/infiltration/rules.yaml
View File

@@ -54,9 +54,6 @@ SPY.Strong:
Types: MissionObjective Types: MissionObjective
ExternalCaptures: ExternalCaptures:
CaptureTypes: MissionObjective CaptureTypes: MissionObjective
EditorOnlyTooltip:
Description: RenderDebugState.OnOwnerChange will crash
-RenderDebugState:
Passenger: Passenger:
GrantUpgrades: mobile GrantUpgrades: mobile
@@ -187,9 +184,6 @@ STEK:
MCV: MCV:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
EditorOnlyTooltip:
Description: RenderDebugState.OnOwnerChange will crash
-RenderDebugState:
APC: APC:
Buildable: Buildable: