diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-26 23:45:00 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-26 23:45:00 +0100 |
commit | 7db960a86c1c1d9ead95188ba86b467bfd56eee4 (patch) | |
tree | b607236d138af703c7433fb5b171731da5c1cd6f /core/src/ch/asynk/tankontank/game/Ctrl.java | |
parent | 777a0edf963f5ccc6854162fd178f282ff9edb47 (diff) | |
download | RustAndDust-7db960a86c1c1d9ead95188ba86b467bfd56eee4.zip RustAndDust-7db960a86c1c1d9ead95188ba86b467bfd56eee4.tar.gz |
Ctrl,Map: Map.animationsDone() returns the count of new animations to run, thus Ctrl might stay in ANIMATION
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/Ctrl.java')
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Ctrl.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index a54deaf..cf08d3f 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/tankontank/game/Ctrl.java @@ -113,10 +113,12 @@ public class Ctrl implements Disposable { animationCount -= 1; if (animationCount == 0) { - map.animationsDone(); - StateType tmp = stateAfterAnimation; - stateAfterAnimation = StateType.DONE; - setState(tmp); + animationCount = map.animationsDone(); + if (animationCount == 0) { + StateType tmp = stateAfterAnimation; + stateAfterAnimation = StateType.DONE; + setState(tmp); + } } if (animationCount < 0) TankOnTank.debug(" animationCount < 0"); |