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

Fixed unnecessary crash if RallyPoint palette is not used.

Browse Source
This commit is contained in:
Andre Mohren
2018-08-16 19:49:04 +02:00
committed by reaperrr
parent 4a5525d1af
commit 8c5caaf154
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.Common/Effects/RallyPointIndicator.cs
View File

@@ -97,18 +97,21 @@ namespace OpenRA.Mods.Common.Effects
IEnumerable<IRenderable> RenderInner(WorldRenderer wr) IEnumerable<IRenderable> RenderInner(WorldRenderer wr)
{ {
var palette = wr.Palette(rp.PaletteName);
if (Game.Settings.Game.DrawTargetLine) if (Game.Settings.Game.DrawTargetLine)
yield return new TargetLineRenderable(targetLine, building.Owner.Color.RGB); yield return new TargetLineRenderable(targetLine, building.Owner.Color.RGB);
if (circles != null) if (circles != null || flag != null)
foreach (var r in circles.Render(targetLine[1], palette)) {
yield return r; var palette = wr.Palette(rp.PaletteName);
if (flag != null) if (circles != null)
foreach (var r in flag.Render(targetLine[1], palette)) foreach (var r in circles.Render(targetLine[1], palette))
yield return r; yield return r;
if (flag != null)
foreach (var r in flag.Render(targetLine[1], palette))
yield return r;
}
} }
} }
} }