Code improvements

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / misc / InputHandlerMenu.java

diff --git a/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerMenu.java b/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerMenu.java
index 74110ea0b88dafbc77b229a7cb5045e4c17d87b1..108da51eb2628bbc0c7f567582f7f5ff41ebdf45 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerMenu.java
+++ b/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerMenu.java
@@ -1,16 +1,17 @@
 package ru.deadsoftware.cavecraft.misc;
 
 import com.badlogic.gdx.InputProcessor;
+import ru.deadsoftware.cavecraft.CaveGame;
 import ru.deadsoftware.cavecraft.GameScreen;
 import ru.deadsoftware.cavecraft.menu.MenuRenderer;
 import ru.deadsoftware.cavecraft.menu.objects.Button;
 
-public class InputHandlerMenu implements InputProcessor{
+public class InputHandlerMenu implements InputProcessor {
 
-    private MenuRenderer renderer;
+    private MenuRenderer menuRenderer;
 
-    public InputHandlerMenu(MenuRenderer renderer) {
-        this.renderer = renderer;
+    public InputHandlerMenu(MenuRenderer menuRenderer) {
+        this.menuRenderer = menuRenderer;
     }
 
     @Override
@@ -35,10 +36,25 @@ public class InputHandlerMenu implements InputProcessor{
 
     @Override
     public boolean touchUp(int screenX, int screenY, int pointer, int mb) {
-        screenX *= renderer.getWidth()/ GameScreen.getWidth();
-        screenY *= renderer.getHeight()/GameScreen.getHeight();
-        for (Button button : renderer.menuMainButtons) {
-            if (button.getRect().contains(screenX, screenY) && button.getType()>0) renderer.buttonClicked(button);
+        screenX *= menuRenderer.getWidth() / GameScreen.getWidth();
+        screenY *= menuRenderer.getHeight() / GameScreen.getHeight();
+        switch (CaveGame.STATE) {
+            case MENU_MAIN:
+                for (Button button : menuRenderer.menuMainBtns) {
+                    if (button.getRect().contains(screenX, screenY) && button.getType() > 0) {
+                        menuRenderer.buttonClicked(button);
+                        break;
+                    }
+                }
+                break;
+            case MENU_NEW_GAME:
+                for (Button button : menuRenderer.menuNGBtns) {
+                    if (button.getRect().contains(screenX, screenY) && button.getType() > 0) {
+                        menuRenderer.buttonClicked(button);
+                        break;
+                    }
+                }
+                break;
         }
         return false;
     }