From becd3167da12d8fd70671d4b71d00f20466ded15 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 12 Sep 2017 18:31:08 -0400 Subject: [PATCH] v0.6.2: fixed more cases where death animations where being interrupted --- .../shatteredpixeldungeon/sprites/CharSprite.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java index 8f0f06186..d221b8d05 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java @@ -124,7 +124,15 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip listener = this; } - public void link( Char ch ) { + @Override + public void play(Animation anim) { + //Shouldn't interrupt the dieing animation + if (curAnim != die) { + super.play(anim); + } + } + + public void link(Char ch ) { this.ch = ch; ch.sprite = this; @@ -171,9 +179,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip } public void idle() { - if (curAnim != die) { - play(idle); - } + play(idle); } public void move( int from, int to ) {