From 3cd7596919dc6f12a6cd0884e5a2fe383e30c959 Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Thu, 27 Nov 2014 09:06:54 +0100
Subject: ShotAnimation,Map: resetAll() -> resetSound() called just before
 building animations

---
 core/src/ch/asynk/tankontank/engine/gfx/animations/ShotAnimation.java | 2 +-
 core/src/ch/asynk/tankontank/game/Map.java                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/src/ch')

diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/ShotAnimation.java b/core/src/ch/asynk/tankontank/engine/gfx/animations/ShotAnimation.java
index 002ec763..9d2257e7 100644
--- a/core/src/ch/asynk/tankontank/engine/gfx/animations/ShotAnimation.java
+++ b/core/src/ch/asynk/tankontank/engine/gfx/animations/ShotAnimation.java
@@ -105,7 +105,7 @@ public class ShotAnimation implements Disposable, Animation, Pool.Poolable
         longShotId = -1;
     }
 
-    public static void resetAll()
+    public static void resetSound()
     {
         longShotId = -1;
     }
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 7d3cba33..95499385 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -190,7 +190,6 @@ public abstract class Map extends Board
 
     public int animationsDone()
     {
-        ShotAnimation.resetAll();
         if (animationClosure != null) {
             addAnimation(animationClosure);
             animationClosure = null;
@@ -336,6 +335,7 @@ public abstract class Map extends Board
 
     public void addEngagementAnimation(Unit target)
     {
+        ShotAnimation.resetSound();
         Hex to = target.getHex();
         for (Unit u : activatedUnits) {
             Hex from = u.getHex();
-- 
cgit v1.2.3