From 8d9542b6f3a81119dbd076abc8484b6bd3b8c14d Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Mon, 22 Feb 2016 06:48:26 +0100 Subject: use type and enter sounds --- core/src/ch/asynk/rustanddust/game/Hud.java | 3 ++- core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'core/src/ch/asynk/rustanddust/game') diff --git a/core/src/ch/asynk/rustanddust/game/Hud.java b/core/src/ch/asynk/rustanddust/game/Hud.java index 89b6349e..e59cae29 100644 --- a/core/src/ch/asynk/rustanddust/game/Hud.java +++ b/core/src/ch/asynk/rustanddust/game/Hud.java @@ -67,7 +67,7 @@ public class Hud implements Disposable, Animation actionButtons = new ActionButtons(game); actionButtons.hide(); msg = new Msg(game.font, game.bgPatch, 20f); - okCancel = new OkCancel(game.font, game.bgPatch, game.factory.getHudRegion(game.factory.ACT_DONE), game.factory.getHudRegion(game.factory.ACT_ABORT)); + okCancel = new OkCancel(game.font, game.bgPatch, game.factory.getHudRegion(game.factory.ACT_DONE), game.factory.getHudRegion(game.factory.ACT_ABORT), game.typeSnd); optionsBtn = new Bg(game.factory.getHudRegion(game.factory.ACT_OPTIONS)); optionsPanel = new OptionsPanel(game); stats = new StatisticsPanel(game); @@ -185,6 +185,7 @@ public class Hud implements Disposable, Animation public boolean hit(float x, float y, boolean isInAnimation) { if (optionsBtn.hit(x, y)) { + game.typeSnd.play(); toggleOptionsPanel(); return true; } diff --git a/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java b/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java index bb7f2315..ea175c99 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java +++ b/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java @@ -139,6 +139,7 @@ public class OptionsPanel extends Patch public boolean hit(float x, float y) { if (objectivesPanel.hit(x, y)) { + game.typeSnd.play(); objectivesPanel.visible = false; this.visible = true; return false; @@ -147,18 +148,23 @@ public class OptionsPanel extends Patch if (!visible) return false; if (fxVolume.hit(x, y) || fxVolumeValue.hit(x, y)) { + game.typeSnd.play(); cycleFxVolume(); } else if (quit.hit(x, y)) { + game.typeSnd.play(); game.ctrl.hud.askQuitBattle(); return false; } else if (objectives.hit(x, y)) { + game.typeSnd.play(); this.visible = false; objectivesPanel.show(game.config.battle); return false; } else { for (int i = 0; i < checkLabels.length; i++) { - if (checkLabels[i].hit(x, y)) + if (checkLabels[i].hit(x, y)) { + game.typeSnd.play(); checkValues[i] =! checkValues[i]; + } } } -- cgit v1.2.3