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

Merge pull request #10568 from abcdefg30/waterCrates

Browse Source 
Fix crates not showing their water animation
This commit is contained in:
Matthias Mailänder
2016-01-23 15:10:26 +01:00
parent 8b478e3d0a b1fac69b01
commit 9d3a3dd9e5
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Common/Traits/Render/WithCrateBody.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
class WithCrateBody : INotifyParachuteLanded class WithCrateBody : INotifyParachuteLanded, INotifyAddedToWorld
{ {
readonly Actor self; readonly Actor self;
readonly Animation anim; readonly Animation anim;
@@ -57,7 +57,21 @@ namespace OpenRA.Mods.Common.Traits
rs.Add(anim); rs.Add(anim);
} }
public void OnLanded() void INotifyAddedToWorld.AddedToWorld(Actor self)
{
// Don't change animations while still in air
if (!self.IsAtGroundLevel())
return;
PlaySequence();
}
void INotifyParachuteLanded.OnLanded()
{
PlaySequence();
}
void PlaySequence()
{ {
var sequence = self.World.Map.GetTerrainInfo(self.Location).IsWater ? info.WaterSequence : info.LandSequence; var sequence = self.World.Map.GetTerrainInfo(self.Location).IsWater ? info.WaterSequence : info.LandSequence;
if (!string.IsNullOrEmpty(sequence)) if (!string.IsNullOrEmpty(sequence))