diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-22 22:57:25 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-22 22:57:25 +0100 |
| commit | f3e66547b54f1721b23fdc771c9dbf1f38c757ef (patch) | |
| tree | 18e7b07c643705972b0ae234bdb59c228e943b97 /core/src/ch/asynk/tankontank/game | |
| parent | aec9aa6c1aafb2c936b50b07d856c077ee09c3a8 (diff) | |
| download | RustAndDust-f3e66547b54f1721b23fdc771c9dbf1f38c757ef.zip RustAndDust-f3e66547b54f1721b23fdc771c9dbf1f38c757ef.tar.gz | |
Map,SoundAnimation: use config.fxVolume
Diffstat (limited to 'core/src/ch/asynk/tankontank/game')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Map.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index f78e499..94ba334 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) |