Some refactor and javadocs

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / CaveGame.java

diff --git a/core/src/ru/deadsoftware/cavedroid/CaveGame.java b/core/src/ru/deadsoftware/cavedroid/CaveGame.java
index ca1118675451390d5d289f8469bc6d77d90514df..57704d98f94f56d186c6c2c845f0dfd2f699d8d6 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/CaveGame.java
+++ b/core/src/ru/deadsoftware/cavedroid/CaveGame.java
@@ -2,15 +2,19 @@ package ru.deadsoftware.cavedroid;
 
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
-import ru.deadsoftware.cavedroid.misc.AppState;
+import ru.deadsoftware.cavedroid.misc.states.AppState;
+import ru.deadsoftware.cavedroid.misc.states.GameState;
+import ru.deadsoftware.cavedroid.misc.states.MenuState;
 
 public class CaveGame extends Game {
 
     public static final String VERSION = "alpha 0.4";
-    public static String GAME_FOLDER;
 
-    public static AppState STATE;
+    public static AppState APP_STATE;
+    public static GameState GAME_STATE;
+    public static MenuState MENU_STATE;
 
+    public static String GAME_FOLDER;
     public static boolean TOUCH;
 
     public CaveGame(String gameFolder) {
@@ -20,7 +24,9 @@ public class CaveGame extends Game {
     public CaveGame(String gameFolder, boolean touch) {
         GAME_FOLDER = gameFolder;
         TOUCH = touch;
-        STATE = AppState.MENU_MAIN;
+        APP_STATE = AppState.MENU;
+        MENU_STATE = MenuState.MAIN;
+        GAME_STATE = GameState.PLAY;
     }
 
     @Override