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

unhardcode rallypoint sprites

Browse Source
This commit is contained in:
Matthias Mailänder
2015-08-05 23:32:10 +02:00
parent b536e677fb
commit df206ddb18
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,22 +20,22 @@ namespace OpenRA.Mods.Common.Effects
{
readonly Actor building;
readonly RallyPoint rp;
readonly string palettePrefix;
readonly string paletteName;
readonly Animation flag;
readonly Animation circles;
public RallyPointIndicator(Actor building, string palettePrefix)
public RallyPointIndicator(Actor building, string paletteName)
{
this.building = building;
this.palettePrefix = palettePrefix;
this.paletteName = paletteName;
rp = building.Trait<RallyPoint>();
flag = new Animation(building.World, "rallypoint");
circles = new Animation(building.World, "rallypoint");
flag = new Animation(building.World, rp.Info.Image);
flag.PlayRepeating(rp.Info.FlagSequence);
flag.PlayRepeating("flag");
circles.Play("circles");
circles = new Animation(building.World, rp.Info.Image);
circles.Play(rp.Info.CirclesSequence);
}
CPos cachedLocation;
@@ -43,10 +43,11 @@ namespace OpenRA.Mods.Common.Effects
{
flag.Tick();
circles.Tick();
if (cachedLocation != rp.Location)
{
cachedLocation = rp.Location;
circles.Play("circles");
circles.Play(rp.Info.CirclesSequence);
}
if (!building.IsInWorld || building.IsDead)
@@ -62,7 +63,7 @@ namespace OpenRA.Mods.Common.Effects
return SpriteRenderable.None;
var pos = wr.World.Map.CenterOfCell(cachedLocation);
var palette = wr.Palette(palettePrefix + building.Owner.InternalName);
var palette = wr.Palette(paletteName);
return circles.Render(pos, palette).Concat(flag.Render(pos, palette));
}
}