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

---
 .../ch/asynk/tankontank/engine/gfx/animations/SoundAnimation.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'core/src/ch/asynk/tankontank/engine/gfx')

diff --git a/core/src/ch/asynk/tankontank/engine/gfx/animations/SoundAnimation.java b/core/src/ch/asynk/tankontank/engine/gfx/animations/SoundAnimation.java
index aaa7787e..797b09b7 100644
--- a/core/src/ch/asynk/tankontank/engine/gfx/animations/SoundAnimation.java
+++ b/core/src/ch/asynk/tankontank/engine/gfx/animations/SoundAnimation.java
@@ -16,6 +16,7 @@ public class SoundAnimation extends TimedAnimation
     private Sound sound;
     private long soundId;
     private Action action;
+    private float volume;
 
     private static final Pool<SoundAnimation> soundAnimationPool = new Pool<SoundAnimation>() {
         @Override
@@ -24,13 +25,14 @@ public class SoundAnimation extends TimedAnimation
         }
     };
 
-    public static SoundAnimation get(Action action, Sound sound, long soundId, float duration)
+    public static SoundAnimation get(Action action, Sound sound, long soundId, float volume, float duration)
     {
         SoundAnimation a = soundAnimationPool.obtain();
 
         a.action = action;
         a.sound = sound;
         a.soundId = soundId;
+        a.volume = volume;
         a.duration = duration;
 
         return a;
@@ -59,11 +61,11 @@ public class SoundAnimation extends TimedAnimation
         float v;
         switch(action) {
             case FADE_IN:
-                v = ( 1.0f * percent);
+                v = ( volume * percent);
                 sound.setVolume(soundId, v);
                 break;
             case FADE_OUT:
-                v = (1.0f - ( 1.0f * percent));
+                v = (volume - ( volume * percent));
                 sound.setVolume(soundId, v);
                 break;
         }
-- 
cgit v1.2.3