summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-02-22 18:23:02 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-02-22 18:23:02 +0100
commit18db2f47e4808eda33f24e1a8571f62344524f71 (patch)
tree8a25ed7261dedb9ded9b7f77dc91e5365f50efba /core/src/ch/asynk/rustanddust/menu/MenuCtrl.java
parent6ec6e479d1fb91c51c65fecee9045c07fa92300d (diff)
downloadRustAndDust-18db2f47e4808eda33f24e1a8571f62344524f71.zip
RustAndDust-18db2f47e4808eda33f24e1a8571f62344524f71.tar.gz
Sound type/enter: nicer, better
Diffstat (limited to 'core/src/ch/asynk/rustanddust/menu/MenuCtrl.java')
-rw-r--r--core/src/ch/asynk/rustanddust/menu/MenuCtrl.java9
1 files changed, 8 insertions, 1 deletions
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);