[Balder-cvs] balder2d/src/menu mainmenu.cpp, 1.1, 1.1.2.1 menu.cpp, 1.31, 1.31.2.1
Status: Beta
Brought to you by:
holomorph
From: Bjorn H. <hol...@us...> - 2006-09-10 00:25:13
|
Update of /cvsroot/balder/balder2d/src/menu In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22303/src/menu Modified Files: Tag: no_network mainmenu.cpp menu.cpp Log Message: removed networkmanager and anything related from the no_network branch Index: menu.cpp =================================================================== RCS file: /cvsroot/balder/balder2d/src/menu/menu.cpp,v retrieving revision 1.31 retrieving revision 1.31.2.1 diff -C2 -d -r1.31 -r1.31.2.1 *** menu.cpp 21 Aug 2006 05:37:21 -0000 1.31 --- menu.cpp 10 Sep 2006 00:25:11 -0000 1.31.2.1 *************** *** 23,32 **** #include "../../include/menu/mainmenu.h" #include "../../include/soundmanager.h" - #include "../../include/networkmanager.h" #include <iostream> using namespace Balder; ! Menu::Menu(SoundManager* s, NetworkManager* n): startgame(false), sound(s), network(n) { //screen = SDL_GetVideoSurface(); --- 23,31 ---- #include "../../include/menu/mainmenu.h" #include "../../include/soundmanager.h" #include <iostream> using namespace Balder; ! Menu::Menu(SoundManager* s): startgame(false), sound(s) { //screen = SDL_GetVideoSurface(); Index: mainmenu.cpp =================================================================== RCS file: /cvsroot/balder/balder2d/src/menu/mainmenu.cpp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** mainmenu.cpp 9 Sep 2006 04:04:34 -0000 1.1 --- mainmenu.cpp 10 Sep 2006 00:25:11 -0000 1.1.2.1 *************** *** 35,43 **** startButton->setWidth(500); - multiplayerButton = new gcn::Button("Network Game"); - multiplayerButton->setEventId("multiplayerMenu"); - multiplayerButton->addActionListener(this); - multiplayerButton->setWidth(500); - optionsButton = new gcn::Button("Options"); optionsButton->setEventId("optionsMenu"); --- 35,38 ---- *************** *** 52,57 **** // Add them to the page container page->add(startButton, 0, 0); ! page->add(multiplayerButton, 0, 60); ! page->add(optionsButton, 0, 120); page->add(quitButton, 0, 180); --- 47,51 ---- // Add them to the page container page->add(startButton, 0, 0); ! page->add(optionsButton, 0, 60); page->add(quitButton, 0, 180); |