git repos / blockattack-game

commit 2f331f0c

sago007 · 2017-08-19 16:17
2f331f0c80dbe4ae863dfc2fed7946b7856ec063 patch · browse files
parent 1176ee18a5484bf36dc3738c43f273688b321b06

Added seperate single player menu

Changed files

M source/code/menudef.cpp before
diff --git a/source/code/menudef.cpp b/source/code/menudef.cpp index 572d591..30288f9 100644 --- a/source/code/menudef.cpp +++ b/source/code/menudef.cpp
@@ -267,10 +267,9 @@ static void MultiplayerMenu() {
RunGameState(mm);
}
-void MainMenu() {
- InitMenues();
- Menu m(globalData.screen,_("Block Attack - Rise of the blocks"),false);
- Button bHi,bTimetrial1, bStageClear, bPuzzle, bVs1, bMulti, bConfigure,bHighscore;
+static void SinglePlayerMenu() {
+ Menu m(globalData.screen, _("Single player"), true);
+ Button bHi,bTimetrial1, bStageClear, bPuzzle, bVs1;
bHi.setLabel(_("Single player - endless") );
bHi.setAction(runSinglePlayerEndless);
bTimetrial1.setLabel(_("Single player - time trial") );
@@ -281,6 +280,20 @@ void MainMenu() {
bPuzzle.setAction(runSinglePlayerPuzzle);
bVs1.setLabel(_("Single player - vs") );
bVs1.setAction(SinglePlayerVsMenu);
+ m.addButton(&bHi);
+ m.addButton(&bTimetrial1);
+ m.addButton(&bStageClear);
+ m.addButton(&bPuzzle);
+ m.addButton(&bVs1);
+ RunGameState(m);
+}
+
+void MainMenu() {
+ InitMenues();
+ Menu m(globalData.screen,_("Block Attack - Rise of the blocks"),false);
+ Button bHi, bMulti, bConfigure,bHighscore;
+ bHi.setLabel(_("Single player") );
+ bHi.setAction(SinglePlayerMenu);
bMulti.setLabel(_("Multi player") );
bMulti.setAction(MultiplayerMenu);
bConfigure.setLabel(_("Configure") );
@@ -288,10 +301,6 @@ void MainMenu() {
bHighscore.setLabel(_("Highscores") );
bHighscore.setAction(buttonActionHighscores);
m.addButton(&bHi);
- m.addButton(&bTimetrial1);
- m.addButton(&bStageClear);
- m.addButton(&bPuzzle);
- m.addButton(&bVs1);
m.addButton(&bMulti);
m.addButton(&bConfigure);
m.addButton(&bHighscore);