From bd29a669b211112f2aba4acc8971df4d18f51032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Fri, 20 Feb 2015 00:51:32 +0100 Subject: Map: destroy animationClosure --- core/src/ch/asynk/tankontank/game/Ctrl.java | 3 --- core/src/ch/asynk/tankontank/game/Map.java | 11 ----------- 2 files changed, 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 -- cgit v1.1-2-g2b99