diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-02-20 00:51:32 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-02-20 00:51:32 +0100 |
| commit | bd29a669b211112f2aba4acc8971df4d18f51032 (patch) | |
| tree | 3fdbc360ecd246d16559f790c76e61d331a2e149 | |
| parent | dc688c7dfe946fc2672624a362960662b291d99b (diff) | |
| download | RustAndDust-bd29a669b211112f2aba4acc8971df4d18f51032.zip RustAndDust-bd29a669b211112f2aba4acc8971df4d18f51032.tar.gz | |
Map: destroy animationClosure
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Ctrl.java | 3 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Map.java | 11 |
2 files changed, 0 insertions, 14 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index b541bb9..fb9495e 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/tankontank/game/Ctrl.java @@ -115,9 +115,6 @@ public class Ctrl implements Disposable animationCount -= 1; if (animationCount > 0) return; - animationCount = map.animationsDone(); - if (animationCount > 0) - return; if (hud.dialogActive()) return; leaveAnimationState(); diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 335a10a..b86b366 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -54,7 +54,6 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS private final Sound infantryMoveSound; private Sound sound; private long soundId = -1; - private Animation animationClosure; private OrderList commands; @@ -232,16 +231,6 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS activatedUnits.clear(); } - public int animationsDone() - { - if (animationClosure != null) { - addAnimation(animationClosure); - animationClosure = null; - return 1; - } - return 0; - } - // -> implement MoveToAnimationCb @Override |