[Pingus-CVS] r3158 - in trunk/pingus: . src

[jsalmon3]

Author: jsalmon3
Date: 2007-09-15 07:50:05 +0200 (Sat, 15 Sep 2007)
New Revision: 3158

Modified:
   trunk/pingus/TODO
   trunk/pingus/src/pingus_menu.cpp
   trunk/pingus/src/pingus_menu.hpp
Log:
Enabled editor in the main menu again

Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO   2007-09-15 05:39:32 UTC (rev 3157)
+++ trunk/pingus/TODO   2007-09-15 05:50:05 UTC (rev 3158)
@@ -67,8 +67,6 @@
 Important:
 ==========
 
-- enable editor in the main menu again (replace credits)
-
 - create verdana11 for latin2 and latin9
 
 - miner remove graphics looks wrong (cmap instead of gfx?)

Modified: trunk/pingus/src/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus_menu.cpp    2007-09-15 05:39:32 UTC (rev 3157)
+++ trunk/pingus/src/pingus_menu.cpp    2007-09-15 05:50:05 UTC (rev 3158)
@@ -58,11 +58,11 @@
                                _("Exit"),
                                _("..:: Bye, bye ::.."));
 
-  credits_button = new MenuButton(this, Vector2i(Display::get_width() * 150 / 
800,
+  editor_button = new MenuButton(this, Vector2i(Display::get_width() * 150 / 
800,
                                           Display::get_height() * 390 / 600),
-                                  
Resource::load_sprite("core/menu/credits_on"),
-                                  _("Credits"),
-                                 _("..:: See the credits ::.."));
+                                  Resource::load_sprite("core/menu/create_on"),
+                                  _("Level Editor"),
+                                 _("..:: Create your own levels ::.."));
 #ifdef NEW_MENU
   contrib_button = new MenuButton(this, Vector2i(Display::get_width() * 150 / 
800,
                                           Display::get_height() * 450 / 600),
@@ -81,12 +81,6 @@
                                       
Resource::load_sprite("core/menu/multi_on"),
                                       _("Multiplayer"),
                                       _("..:: Multiplayer Match ::.."));
-
-  editor_button = new MenuButton(this, Vector2i(Display::get_width() * 400 / 
800,
-                                         Display::get_height() * 450 / 600),
-                                 Resource::load_sprite("core/menu/create_on"),
-                                 _("Level Editor"),
-                                 _("..:: Create your own levels ::.."));
 #endif
 }
 
@@ -102,7 +96,7 @@
 
   gui_manager->add(quit_button, false);
   gui_manager->add(start_button, false);
-  gui_manager->add(credits_button, false);
+  gui_manager->add(editor_button, false);
 }
 
 #ifdef NEW_MENU
@@ -163,12 +157,11 @@
 {
   delete start_button;
   delete quit_button;
-  delete credits_button;
+  delete editor_button;
 #ifdef NEW_MENU
   delete contrib_button;
   delete story_button;
   delete multiplayer_button;
-  delete editor_button;
 #endif
   delete filedialog;
 }
@@ -286,9 +279,9 @@
     {
       do_quit();
     }
-  else if (button == credits_button)
+  else if (button == editor_button)
     {
-      show_credits();
+      do_edit();
     }
 #ifdef NEW_MENU
   else if (button == contrib_button)
@@ -303,10 +296,6 @@
     {
       setup_main_menu();
     }
-  else if (button == editor_button)
-    {
-      do_edit();
-    }
 #endif
 }
 

Modified: trunk/pingus/src/pingus_menu.hpp
===================================================================
--- trunk/pingus/src/pingus_menu.hpp    2007-09-15 05:39:32 UTC (rev 3157)
+++ trunk/pingus/src/pingus_menu.hpp    2007-09-15 05:50:05 UTC (rev 3158)
@@ -46,13 +46,12 @@
 
   MenuButton* start_button;
   MenuButton* quit_button;
-  MenuButton* credits_button;
+  MenuButton* editor_button;
 
 #ifdef NEW_MENU
   MenuButton* contrib_button;
   MenuButton* story_button;
   MenuButton* multiplayer_button;
-  MenuButton* editor_button;
 #endif
   FileDialog* filedialog;