menu functionality

This commit is contained in:
Administrator
2014-02-21 10:02:16 +01:00
parent 9a00f4e61a
commit c83775a756
2 changed files with 6 additions and 13 deletions
-11
View File
@@ -47,17 +47,6 @@ public class CanvasView extends View
Gameplay.SetPayedVersion(PayedVersion); Gameplay.SetPayedVersion(PayedVersion);
Foreground = Gamemenu; Foreground = Gamemenu;
//temp
//this.gameStateChanged(GameStateInterface.GS_MENU_START);
// Game Start. First Load
//((GamePlay)Gameplay).SetStartLevel(startLevel);
//((GamePlay)Gameplay).SetGameState(GamePlay.GS_LOAD, false);
// Start Game.
//if (((GamePlay)Gameplay).GetGameState() == GameStateInterface.GS_READY)
// ((GamePlay)Gameplay).SetGameState(GameStateInterface.GS_START, false);
} }
@Override @Override
+6 -2
View File
@@ -37,7 +37,6 @@ public class GameMenu extends GameStateInterface
case GS_GAMEOVER: case GS_GAMEOVER:
{ {
ShowGameOverMenu(canvas); ShowGameOverMenu(canvas);
SetGameState(GS_MENU_READY, false);
break; break;
} }
} }
@@ -64,6 +63,12 @@ public class GameMenu extends GameStateInterface
} }
break; break;
} }
case GS_GAMEOVER:
{
SetGameState(GS_MENU_READY, false);
canvasView.postInvalidate();
break;
}
} }
} }
@@ -135,7 +140,6 @@ public class GameMenu extends GameStateInterface
MediaPlayer mp; MediaPlayer mp;
// Load // Load
private void Load() private void Load()
{ {
SetGameState(GS_LOADING, false); SetGameState(GS_LOADING, false);