diff options
Diffstat (limited to 'core/src/ch/asynk/rustanddust/menu')
6 files changed, 27 insertions, 20 deletions
diff --git a/core/src/ch/asynk/rustanddust/menu/MainMenu.java b/core/src/ch/asynk/rustanddust/menu/MainMenu.java index c51f73e..6d7016a 100644 --- a/core/src/ch/asynk/rustanddust/menu/MainMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/MainMenu.java @@ -102,7 +102,7 @@ public class MainMenu extends Patch implements MenuCtrl.Panel int idx = -1; for (int i = 0; i< Item.NONE.i; i ++) { if (labels[i].hit(x, y)) { - game.typeSnd.play(); + game.playType(); return Item.get(i).t; } } diff --git a/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java b/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java index 49a959c..b793d9a 100644 --- a/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java +++ b/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java @@ -37,6 +37,8 @@ public class MenuCtrl implements Disposable, Drawable public boolean drag(float x, float y, int dx, int dy); } + private final RustAndDust game; + public boolean visible; private Panel []panels; private MenuType current; @@ -44,13 +46,14 @@ public class MenuCtrl implements Disposable, Drawable public MenuCtrl(final RustAndDust game) { + this.game = game; this.panels = new Panel[MenuType.NONE.i]; this.panels[MenuType.MAIN.i] = new MainMenu(game); this.panels[MenuType.OPTIONS.i] = new OptionsMenu(game); this.panels[MenuType.TUTORIALS.i] = new TutorialsMenu(game); this.panels[MenuType.PLAY.i] = new PlayMenu(game); this.panels[MenuType.NEW_GAME.i] = new NewGameMenu(game); - this.okCancel = new OkCancel(game.font, game.bgPatch, game.getUiRegion(game.UI_OK), game.getUiRegion(game.UI_CANCEL), game.typeSnd); + this.okCancel = new OkCancel(game.font, game.bgPatch, game.getUiRegion(game.UI_OK), game.getUiRegion(game.UI_CANCEL)); this.current = MenuType.MAIN; @@ -68,6 +71,10 @@ public class MenuCtrl implements Disposable, Drawable public boolean touch(float x, float y) { if (okCancel.hit(x, y)) { + if (okCancel.ok) + game.playEnter(); + else + game.playType(); visible = true; okCancel.visible = false; panels[current.i].postAnswer(okCancel.ok); diff --git a/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java b/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java index f91ed93..4a4f3c7 100644 --- a/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java @@ -121,7 +121,7 @@ public class NewGameMenu extends Patch implements MenuCtrl.Panel public MenuCtrl.MenuType touch(float x, float y) { if (objectivesPanel.hit(x, y)) { - game.typeSnd.play(); + game.playType(); this.visible = true; objectivesPanel.visible = false; return MenuCtrl.MenuType.NONE; @@ -130,19 +130,19 @@ public class NewGameMenu extends Patch implements MenuCtrl.Panel if (!visible) return MenuCtrl.MenuType.NONE; if (okBtn.hit(x, y)) { - game.enterSnd.play(); + game.playEnter(); return apply(); } else if (cancelBtn.hit(x, y)) { - game.typeSnd.play(); + game.playType(); return MenuCtrl.MenuType.MAIN; } else if (gameMode.hit(x, y) || gameModeValue.hit(x, y)) { - game.typeSnd.play(); + game.playType(); cycleGameMode(); } else if (battle.hit(x, y) || battleValue.hit(x, y)) { - game.typeSnd.play(); + game.playType(); cycleBattle(); } else if (objectives.hit(x, y)) { - game.typeSnd.play(); + game.playType(); this.visible = false; objectivesPanel.show(game.config.battle); } diff --git a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java index 8ec9b10..c1b5603 100644 --- a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java @@ -164,23 +164,23 @@ public class OptionsMenu extends Patch implements MenuCtrl.Panel public MenuCtrl.MenuType touch(float x, float y) { if (okBtn.hit(x, y)) { - game.enterSnd.play(); + game.playEnter(); apply(); return MenuCtrl.MenuType.MAIN; } else if (cancelBtn.hit(x, y)) { - game.typeSnd.play(); + game.playType(); getValues(); return MenuCtrl.MenuType.MAIN; } else if (fxVolume.hit(x, y) || fxVolumeValue.hit(x, y)) { - game.typeSnd.play(); cycleFxVolume(); + game.playType((fxVolumeIdx / 10.0f)); } else if (graphics.hit(x, y) || graphicsValue.hit(x, y)) { - game.typeSnd.play(); + game.playType(); cycleGraphics(); } else { for (int i = 0; i < checkLabels.length; i++) { if (checkLabels[i].hit(x, y)) { - game.typeSnd.play(); + game.playType(); checkValues[i] =! checkValues[i]; } } diff --git a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java index fb1c9ef..c442cd6 100644 --- a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java @@ -119,24 +119,24 @@ public class PlayMenu extends Patch implements MenuCtrl.Panel Integer i = getList().getIdx(); if (newBtn.hit(x, y)) { - game.enterSnd.play(); + game.playEnter(); return MenuCtrl.MenuType.NEW_GAME; } else if (cancelBtn.hit(x, y)) { - game.typeSnd.play(); + game.playType(); return MenuCtrl.MenuType.MAIN; } else if (newBtn.hit(x, y)) { - game.enterSnd.play(); + game.playEnter(); return MenuCtrl.MenuType.NEW_GAME; } else if (deleteBtn.hit(x, y)) { - game.typeSnd.play(); + game.playType(); return MenuCtrl.MenuType.OKKO; } else if (joinBtn.hit(x, y)) { - game.typeSnd.play(); + game.playType(); game.config.gameId = GameRecord.get(getList().getIdx()).g; return MenuCtrl.MenuType.BEGIN; } else if (list.hit(x, y)) { if (i != getList().getIdx()) - game.typeSnd.play(); + game.playType(); if(getList().getIdx() == null) { deleteBtn.visible = false; joinBtn.visible = false; diff --git a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java index e397660..02b65c3 100644 --- a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java @@ -69,7 +69,7 @@ public class TutorialsMenu extends Patch implements MenuCtrl.Panel public MenuCtrl.MenuType touch(float x, float y) { if (rect.contains(x, y) || okBtn.hit(x, y)) { - game.enterSnd.play(); + game.playEnter(); return MenuCtrl.MenuType.MAIN; } |