X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fmenu%2FMenuRenderer.java;h=acfad3d6f29b50138b901a9986ad658d7500c7fb;hb=e7be8067d83f2a39c237ec7afbe115a846a74f3d;hp=4f3e3b16e3fd605e61fe0f1e9f274e3b008b61c2;hpb=6ab2a53526f16de139d39a59c3d800e5f3013c68;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java b/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java
index 4f3e3b1..acfad3d 100644
--- a/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java
@@ -4,7 +4,11 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.utils.Array;
 import ru.deadsoftware.cavecraft.*;
 import ru.deadsoftware.cavecraft.game.GameSaver;
+import ru.deadsoftware.cavecraft.game.Items;
 import ru.deadsoftware.cavecraft.menu.objects.Button;
+import ru.deadsoftware.cavecraft.misc.AppState;
+import ru.deadsoftware.cavecraft.misc.Assets;
+import ru.deadsoftware.cavecraft.misc.Renderer;
 
 public class MenuRenderer extends Renderer {
 
@@ -20,14 +24,8 @@ public class MenuRenderer extends Renderer {
 
     public void buttonClicked(Button button) {
         if (button.getLabel().toLowerCase().equals("new game")) {
-            spriteBatch.begin();
-            drawGenWorld();
-            spriteBatch.end();
             CaveGame.STATE = AppState.GOTO_NEW_GAME;
         } else if (button.getLabel().toLowerCase().equals("load game")) {
-            spriteBatch.begin();
-            drawGenWorld();
-            spriteBatch.end();
             CaveGame.STATE = AppState.GOTO_LOAD_GAME;
         } else if (button.getLabel().toLowerCase().equals("quit")) {
             Gdx.app.exit();
@@ -41,7 +39,7 @@ public class MenuRenderer extends Renderer {
                 (button.getX()+button.getWidth()/2)-Assets.getStringWidth(button.getLabel())/2,
                 (button.getY()+button.getHeight()/2)-Assets.getStringHeight(button.getLabel())/2);
     }
-    
+
     private void drawMenuMain() {
         for (Button button : menuMainButtons) {
             if (button.getType()>0) {
@@ -54,15 +52,8 @@ public class MenuRenderer extends Renderer {
         }
     }
 
-    private void drawGenWorld() {
-        for (int x=0; x<=getWidth()/16; x++)
-            for (int y=0; y<=getHeight()/16; y++) {
-                spriteBatch.draw(Items.BLOCKS.get("dirt").getTexture(), x * 16, y * 16);
-                spriteBatch.draw(Assets.shade,x*16,y*16);
-            }
-        spriteBatch.draw(Assets.gameLogo, getWidth()/2-Assets.gameLogo.getWidth()/2, 0);
-        drawString("Generating World...");
-        spriteBatch.flush();
+    public void drawLabel(String str) {
+        drawString(str);
     }
 
     @Override
@@ -77,10 +68,19 @@ public class MenuRenderer extends Renderer {
 
         switch (CaveGame.STATE) {
             case MENU_MAIN: drawMenuMain(); break;
+            case GOTO_NEW_GAME: case GOTO_LOAD_GAME: drawLabel("Generating World..."); break;
+            case GOTO_MENU: drawLabel("Saving Game..."); break;
         }
 
         drawString("CaveCraft "+CaveGame.VERSION,0,
                 getHeight()-Assets.getStringHeight("CaveCraft "+CaveGame.VERSION)*1.5f);
         spriteBatch.end();
+
+        switch (CaveGame.STATE) {
+            case GOTO_NEW_GAME: CaveGame.STATE = AppState.NEW_GAME; break;
+            case GOTO_LOAD_GAME: CaveGame.STATE = AppState.LOAD_GAME; break;
+            case GOTO_MENU: CaveGame.STATE = AppState.SAVE_GAME; break;
+        }
+
     }
 }