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

crate should only choose water/land type on landing, not every tick.

Browse Source
This commit is contained in:
Chris Forbes
2010-07-29 18:49:41 +12:00
parent bb0531b80f
commit 2d4efc7942
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Crate.cs
View File

@@ -73,13 +73,9 @@ namespace OpenRA.Mods.RA
public void Tick(Actor self) public void Tick(Actor self)
{ {
var cell = Util.CellContaining(self.CenterLocation);
if (++ticks >= self.Info.Traits.Get<CrateInfo>().Lifetime * 25) if (++ticks >= self.Info.Traits.Get<CrateInfo>().Lifetime * 25)
self.World.AddFrameEndTask(w => w.Remove(self)); self.World.AddFrameEndTask(w => w.Remove(self));
var seq = self.World.GetTerrainInfo(cell).IsWater ? "water" : "idle";
if (seq != self.traits.Get<RenderSimple>().anim.CurrentSequence.Name)
self.traits.Get<RenderSimple>().anim.PlayRepeating(seq);
} }
public int2 TopLeft { get { return Location; } } public int2 TopLeft { get { return Location; } }
@@ -96,6 +92,10 @@ namespace OpenRA.Mods.RA
{ {
Location = cell; Location = cell;
self.CenterLocation = Util.CenterOfCell(cell); self.CenterLocation = Util.CenterOfCell(cell);
var seq = self.World.GetTerrainInfo(cell).IsWater ? "water" : "idle";
if (seq != self.traits.Get<RenderSimple>().anim.CurrentSequence.Name)
self.traits.Get<RenderSimple>().anim.PlayRepeating(seq);
} }
public IEnumerable<string> CrushClasses { get { yield return "crate"; } } public IEnumerable<string> CrushClasses { get { yield return "crate"; } }