Rename GameState.java -> AppState.java

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / menu / MenuRenderer.java

diff --git a/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java b/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java
index 76f2355760cbf15245cfb5b8fad6bbc526839f63..aa2897db09265c1471b64578ba6cf7c4063ee0b7 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java
@@ -3,6 +3,7 @@ package ru.deadsoftware.cavecraft.menu;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.utils.Array;
 import ru.deadsoftware.cavecraft.*;
+import ru.deadsoftware.cavecraft.AppState;
 import ru.deadsoftware.cavecraft.menu.objects.Button;
 
 public class MenuRenderer extends Renderer {
@@ -18,7 +19,7 @@ public class MenuRenderer extends Renderer {
 
     public void buttonClicked(Button button) {
         if (button.getLabel().toLowerCase().equals("play")) {
-            CaveGame.STATE = GameState.RESTART;
+            CaveGame.STATE = AppState.GOTO_GAME;
         } else if (button.getLabel().toLowerCase().equals("quit")) {
             Gdx.app.exit();
         }
@@ -26,6 +27,7 @@ public class MenuRenderer extends Renderer {
 
     private void drawButton(Button button) {
         spriteBatch.draw(Assets.menuButton[button.getType()], button.getX(), button.getY());
+        setFontColor(255,255,255);
         drawString(button.getLabel(),
                 (button.getX()+button.getWidth()/2)-Assets.getStringWidth(button.getLabel())/2,
                 (button.getY()+button.getHeight()/2)-Assets.getStringHeight(button.getLabel())/2);
@@ -34,9 +36,11 @@ public class MenuRenderer extends Renderer {
     @Override
     public void render() {
         spriteBatch.begin();
-        for (int x=0; x<=getWidth(); x++)
-            for (int y=0; y<=getHeight(); y++)
-                spriteBatch.draw(Items.BLOCKS.get("dirt").getTexture(),x*16,y*16);
+        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);
         for (Button button : buttons) {
             if (button.getRect().contains(Gdx.input.getX()*getWidth()/GameScreen.getWidth(),
@@ -48,7 +52,7 @@ public class MenuRenderer extends Renderer {
             drawButton(button);
         }
         drawString("CaveCraft "+CaveGame.VERSION,0,
-                getHeight()-Assets.getStringHeight("CaveCraft "+CaveGame.VERSION)*2);
+                getHeight()-Assets.getStringHeight("CaveCraft "+CaveGame.VERSION)*1.5f);
         spriteBatch.end();
     }
 }