[Pingus-CVS] r2845 - branches/pingus_sdl/src

[jsalmon3]

Author: jsalmon3
Date: 2007-08-12 01:38:13 +0200 (Sun, 12 Aug 2007)
New Revision: 2845

Modified:
   branches/pingus_sdl/src/pingus_menu.cpp
   branches/pingus_sdl/src/pingus_menu.hpp
Log:
Use NEW_MENU for the new menus

Modified: branches/pingus_sdl/src/pingus_menu.cpp
===================================================================
--- branches/pingus_sdl/src/pingus_menu.cpp     2007-08-11 23:31:48 UTC (rev 
2844)
+++ branches/pingus_sdl/src/pingus_menu.cpp     2007-08-11 23:38:13 UTC (rev 
2845)
@@ -62,7 +62,7 @@
                                   
Resource::load_sprite("core/menu/credits_on"),
                                   _("Credits"),
                                  _("..:: See the credits ::.."));
-#if 0
+#ifdef NEW_MENU
   contrib_button = new MenuButton(this, Vector2i(Display::get_width() * 150 / 
800,
                                           Display::get_height() * 450 / 600),
                                   
Resource::load_sprite("core/menu/options_on"),
@@ -92,7 +92,7 @@
 void
 PingusMenu::setup_main_menu()
 {
-#if 0
+#ifdef NEW_MENU
   gui_manager->remove(contrib_button);
   gui_manager->remove(story_button);
   gui_manager->remove(multiplayer_button);
@@ -104,7 +104,7 @@
   gui_manager->add(credits_button, false);
 }
 
-#if 0
+#ifdef NEW_MENU
 void
 PingusMenu::setup_game_menu()
 {
@@ -163,7 +163,7 @@
   delete start_button;
   delete quit_button;
   delete credits_button;
-#if 0
+#ifdef NEW_MENU
   delete contrib_button;
   delete story_button;
   delete multiplayer_button;
@@ -274,8 +274,11 @@
 {
   if (button == start_button)
     {
-      // setup_game_menu();
+#ifdef NEW_MENU
+      setup_game_menu();
+#else
       do_start("data/worldmaps/tutorial.worldmap");
+#endif
     }
   else if (button == quit_button)
     {
@@ -285,7 +288,7 @@
     {
       show_credits();
     }
-#if 0
+#ifdef NEW_MENU
   else if (button == contrib_button)
     {
       setup_contrib_menu();

Modified: branches/pingus_sdl/src/pingus_menu.hpp
===================================================================
--- branches/pingus_sdl/src/pingus_menu.hpp     2007-08-11 23:31:48 UTC (rev 
2844)
+++ branches/pingus_sdl/src/pingus_menu.hpp     2007-08-11 23:38:13 UTC (rev 
2845)
@@ -48,7 +48,7 @@
   MenuButton* quit_button;
   MenuButton* credits_button;
 
-#if 0
+#ifdef NEW_MENU
   MenuButton* contrib_button;
   MenuButton* story_button;
   MenuButton* multiplayer_button;
@@ -60,7 +60,7 @@
 
   // These functions setup the different menus
   void setup_main_menu();
-#if 0
+#ifdef NEW_MENU
   void setup_game_menu();
 #endif
   void show_credits();