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

RallyPointIndicator now optional

Browse Source
This commit is contained in:
Andre Mohren
2017-10-25 22:47:28 +02:00
committed by reaperrr
parent cba7c60f6f
commit cfeeb6563e
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,17 +33,23 @@ namespace OpenRA.Mods.Common.Effects
this.rp = rp; this.rp = rp;
this.exits = exits; this.exits = exits;
flag = new Animation(building.World, rp.Info.Image); if (rp.Info.Image != null)
flag.PlayRepeating(rp.Info.FlagSequence); {
flag = new Animation(building.World, rp.Info.Image);
flag.PlayRepeating(rp.Info.FlagSequence);
circles = new Animation(building.World, rp.Info.Image); circles = new Animation(building.World, rp.Info.Image);
circles.Play(rp.Info.CirclesSequence); circles.Play(rp.Info.CirclesSequence);
}
} }
void IEffect.Tick(World world) void IEffect.Tick(World world)
{ {
flag.Tick(); if (flag != null)
circles.Tick(); flag.Tick();
if (circles != null)
circles.Tick();
if (cachedLocation != rp.Location) if (cachedLocation != rp.Location)
{ {
@@ -68,7 +74,8 @@ namespace OpenRA.Mods.Common.Effects
targetLine[0] = exitPos; targetLine[0] = exitPos;
targetLine[1] = rallyPos; targetLine[1] = rallyPos;
circles.Play(rp.Info.CirclesSequence); if (circles != null)
circles.Play(rp.Info.CirclesSequence);
} }
if (!building.IsInWorld || building.IsDead) if (!building.IsInWorld || building.IsDead)
@@ -95,11 +102,13 @@ namespace OpenRA.Mods.Common.Effects
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);
foreach (var r in circles.Render(targetLine[1], palette)) if (circles != null)
yield return r; foreach (var r in circles.Render(targetLine[1], palette))
yield return r;
foreach (var r in flag.Render(targetLine[1], palette)) if (flag != null)
yield return r; foreach (var r in flag.Render(targetLine[1], palette))
yield return r;
} }
} }
} }