summaryrefslogtreecommitdiffstats
path: root/core/src/ch
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-27 09:06:54 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-27 09:06:54 +0100
commit3cd7596919dc6f12a6cd0884e5a2fe383e30c959 (patch)
treefe9b270b7c1190450f621f225550c60de4ff2790 /core/src/ch
parent944153dd21a33f16dd7f34b4a33e01cfd24f4abb (diff)
downloadRustAndDust-3cd7596919dc6f12a6cd0884e5a2fe383e30c959.zip
RustAndDust-3cd7596919dc6f12a6cd0884e5a2fe383e30c959.tar.gz
ShotAnimation,Map: resetAll() -> resetSound() called just before building animations
Diffstat (limited to 'core/src/ch')
-rw-r--r--core/src/ch/asynk/tankontank/engine/gfx/animations/ShotAnimation.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/Map.java2
2 files changed, 2 insertions, 2 deletions
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 002ec76..9d2257e 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 7d3cba3..9549938 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();