commit b0222eff
Two player TT and VS in menu
git-svn-id: https://blockattack.svn.sourceforge.net/svnroot/blockattack/trunk@141 9d7177f8-192b-0410-8f35-a16a89829b06
Changed files
| M | source/code/main.cpp before |
| M | source/code/menudef.cpp before |
diff --git a/source/code/main.cpp b/source/code/main.cpp
index 12ec28d..bc8a475 100644
--- a/source/code/main.cpp
+++ b/source/code/main.cpp
@@ -3722,6 +3722,12 @@ int runGame(int gametype, int level)
strcpy(theGame2.name, player2name);
}
break;
+ case 10:
+ StarTwoPlayerTimeTrial();
+ break;
+ case 11:
+ StartTwoPlayerVs();
+ break;
case 0:
default:
StartSinglePlayerEndless();
diff --git a/source/code/menudef.cpp b/source/code/menudef.cpp
index d06e94e..0c2e1d3 100644
--- a/source/code/menudef.cpp
+++ b/source/code/menudef.cpp
@@ -129,6 +129,16 @@ void runSinglePlayerVs(Button* b)
runGame(4,b->iGeneric1);
}
+void runTwoPlayerTimeTrial(Button* b)
+{
+ runGame(10,0);
+}
+
+void runTwoPlayerVs(Button* b)
+{
+ runGame(11,0);
+}
+
void buttonActionMusic(Button* b)
{
MusicEnabled = !MusicEnabled;
@@ -264,11 +274,34 @@ void SinglePlayerVsMenu(Button *b)
spvs.run();
}
+void NetworkMenu(Button *b)
+{
+ Menu nm(&screen,_("Network"),true);
+}
+
+void MultiplayerMenu(Button *b)
+{
+ Menu mm(&screen,_("Multiplayer"),true);
+ Button bTT, bVs, bNet;
+ bTT.setLabel(_("Two player - time trial"));
+ bTT.setAction(runTwoPlayerTimeTrial);
+ bVs.setLabel(_("Two player - vs"));
+ bVs.setAction(runTwoPlayerVs);
+ bNet.setLabel(_("Network/Internet game"));
+ bNet.setAction(NetworkMenu);
+ mm.addButton(&bTT);
+ mm.addButton(&bVs);
+#if NETWORK
+ mm.addButton(&bNet);
+#endif
+ mm.run();
+}
+
void MainMenu()
{
InitMenues();
Menu m(&screen,_("Block Attack - Rise of the blocks"),false);
- Button bHi,bTimetrial1, bStageClear, bPuzzle, bVs1, bConfigure,bHighscore;
+ Button bHi,bTimetrial1, bStageClear, bPuzzle, bVs1, bMulti, bConfigure,bHighscore;
bHi.setLabel(_("Single player - endless") );
bHi.setAction(runSinglePlayerEndless);
bTimetrial1.setLabel(_("Single player - time trial") );
@@ -279,6 +312,8 @@ void MainMenu()
bPuzzle.setAction(runSinglePlayerPuzzle);
bVs1.setLabel(_("Single player - vs") );
bVs1.setAction(SinglePlayerVsMenu);
+ bMulti.setLabel(_("Multi player") );
+ bMulti.setAction(MultiplayerMenu);
bConfigure.setLabel(_("Configure") );
bConfigure.setAction(ConfigureMenu);
bHighscore.setLabel(_("Highscores") );
@@ -288,6 +323,7 @@ void MainMenu()
m.addButton(&bStageClear);
m.addButton(&bPuzzle);
m.addButton(&bVs1);
+ m.addButton(&bMulti);
m.addButton(&bConfigure);
m.addButton(&bHighscore);
m.run();