Feature/help state

Conflicts:
	image/Images.java
This commit is contained in:
jancoow
2015-06-26 21:17:09 +02:00
6 changed files with 129 additions and 23 deletions
+3
View File
@@ -7,6 +7,7 @@ import java.util.List;
import model.SongHandler;
import model.gameState.GameOverState;
import model.gameState.GameState;
import model.gameState.HelpState;
import model.gameState.MenuState;
import model.gameState.PlayState;
import model.gameState.PreGameState;
@@ -29,6 +30,7 @@ public class GameStateManager {
public enum State {
TITLE_STATE,
MENU_STATE,
HELP_STATE,
PLAY_STATE,
GAMEOVER_STATE,
PRE_GAME_STATE
@@ -38,6 +40,7 @@ public class GameStateManager {
gamestates = new ArrayList<GameState>();
gamestates.add(new TitleState(this, sh, sql));
gamestates.add(new MenuState(this, sh, sql));
gamestates.add(new HelpState(this, sh, sql));
gamestates.add(new PlayState(this, sh, sql));
gamestates.add(new GameOverState(this, sh, sql));
gamestates.add(new PreGameState(this,sh, sql));