From f3e66547b54f1721b23fdc771c9dbf1f38c757ef Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Sat, 22 Nov 2014 22:57:25 +0100
Subject: Map,SoundAnimation: use config.fxVolume

---
 core/src/ch/asynk/tankontank/game/Map.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/src/ch/asynk/tankontank/game')

diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index f78e4992..94ba3340 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -242,7 +242,7 @@ public abstract class Map extends Board
         moveableUnits.remove(unit);
         activatedUnits.add(unit);
         sound = moveSound;
-        soundId = sound.play(1.0f);
+        soundId = sound.play(ctrl.cfg.fxVolume);
         return moveableUnits.size();
     }
 
@@ -260,7 +260,7 @@ public abstract class Map extends Board
     {
         TankOnTank.debug("animation done");
         if (soundId >= 0)
-            addAnimation( SoundAnimation.get(SoundAnimation.Action.FADE_OUT, sound, soundId, 0.5f));
+            addAnimation( SoundAnimation.get(SoundAnimation.Action.FADE_OUT, sound, soundId, ctrl.cfg.fxVolume, 0.5f));
         soundId = -1;
         ctrl.animationDone();
     }
@@ -335,7 +335,7 @@ public abstract class Map extends Board
         seq.addAnimation(notifyDoneAnimation(target));
         addAnimation(seq);
         sound = engagementSound;
-        sound.play(1.0f);
+        sound.play(ctrl.cfg.fxVolume);
     }
 
     public boolean engageUnit(Unit unit, final Unit target)
-- 
cgit v1.2.3