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

Play StartSequence when With*SpriteBody is enabled

Browse Source 
Not only on actor creation.
This commit is contained in:
reaperrr
2019-05-10 15:24:58 +02:00
committed by abcdefg30
parent 666169e9b9
commit 7a403c9af5
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/Render/WithSpriteBody.cs
View File

@@ -76,12 +76,6 @@ namespace OpenRA.Mods.Common.Traits.Render
// Cache the bounds from the default sequence to avoid flickering when the animation changes // Cache the bounds from the default sequence to avoid flickering when the animation changes
boundsAnimation = new Animation(init.World, rs.GetImage(init.Self), baseFacing, paused); boundsAnimation = new Animation(init.World, rs.GetImage(init.Self), baseFacing, paused);
boundsAnimation.PlayRepeating(info.Sequence); boundsAnimation.PlayRepeating(info.Sequence);
if (info.StartSequence != null)
PlayCustomAnimation(init.Self, info.StartSequence,
() => DefaultAnimation.PlayRepeating(NormalizeSequence(init.Self, info.Sequence)));
else
DefaultAnimation.PlayRepeating(NormalizeSequence(init.Self, info.Sequence));
} }
public string NormalizeSequence(Actor self, string sequence) public string NormalizeSequence(Actor self, string sequence)
@@ -91,7 +85,11 @@ namespace OpenRA.Mods.Common.Traits.Render
protected override void TraitEnabled(Actor self) protected override void TraitEnabled(Actor self)
{ {
DefaultAnimation.PlayRepeating(NormalizeSequence(self, Info.Sequence)); if (Info.StartSequence != null)
PlayCustomAnimation(self, Info.StartSequence,
() => DefaultAnimation.PlayRepeating(NormalizeSequence(self, Info.Sequence)));
else
DefaultAnimation.PlayRepeating(NormalizeSequence(self, Info.Sequence));
} }
public virtual void PlayCustomAnimation(Actor self, string name, Action after = null) public virtual void PlayCustomAnimation(Actor self, string name, Action after = null)