summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/game
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-02-22 06:48:26 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-02-22 06:48:26 +0100
commit8d9542b6f3a81119dbd076abc8484b6bd3b8c14d (patch)
tree3c82433de79a7a956f7005c98cf5dcb6013b739a /core/src/ch/asynk/rustanddust/game
parent7da8beb96a470d919ccf4eee1311ac1958234689 (diff)
downloadRustAndDust-8d9542b6f3a81119dbd076abc8484b6bd3b8c14d.zip
RustAndDust-8d9542b6f3a81119dbd076abc8484b6bd3b8c14d.tar.gz
use type and enter sounds
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Hud.java3
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java8
2 files changed, 9 insertions, 2 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Hud.java b/core/src/ch/asynk/rustanddust/game/Hud.java
index 89b6349..e59cae2 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 bb7f231..ea175c9 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];
+ }
}
}