summaryrefslogtreecommitdiffstats
path: root/core/src/ch
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-02-20 00:51:32 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-02-20 00:51:32 +0100
commitbd29a669b211112f2aba4acc8971df4d18f51032 (patch)
tree3fdbc360ecd246d16559f790c76e61d331a2e149 /core/src/ch
parentdc688c7dfe946fc2672624a362960662b291d99b (diff)
downloadRustAndDust-bd29a669b211112f2aba4acc8971df4d18f51032.zip
RustAndDust-bd29a669b211112f2aba4acc8971df4d18f51032.tar.gz
Map: destroy animationClosure
Diffstat (limited to 'core/src/ch')
-rw-r--r--core/src/ch/asynk/tankontank/game/Ctrl.java3
-rw-r--r--core/src/ch/asynk/tankontank/game/Map.java11
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