removed title from main menu

SVN-Revision: 448

diff --git a/src/menu.cpp b/src/menu.cpp
index 893962d..f8bfbf1 100644 (file)
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -293,7 +293,6 @@ Menu::action()
     }
 }
 
-/* Check, if the value of the active menu item has changed. */
 int
 Menu::check()
 {

diff --git a/src/menu.h b/src/menu.h
index fc1c027..e8a3f40 100644 (file)
--- a/src/menu.h
+++ b/src/menu.h
@@ -79,6 +79,8 @@ public:
   void additem(menu_item_type* pmenu_item);
   void additem(MenuItemKind kind, char *text, int init_toggle, Menu* target_menu);
   void action ();
+
+  /** Check, if the value of the active menu item has changed. */
   int  check  ();
   void draw   ();
   void draw_item(int index, int menu_width, int menu_height);

diff --git a/src/setup.cpp b/src/setup.cpp
index 7dfc780..8350bdf 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -359,16 +359,13 @@ void st_menu(void)
   game_menu      = new Menu();
   highscore_menu = new Menu();
 
-  main_menu->set_pos(screen->w/2, 350);
-  main_menu->additem(MN_LABEL,"Main Menu",0,0);
-  main_menu->additem(MN_HL,"",0,0);
+  main_menu->set_pos(screen->w/2, 335);
   main_menu->additem(MN_ACTION,"Start Game",0,0);
   main_menu->additem(MN_GOTO,"Load Game",0,load_game_menu);
   main_menu->additem(MN_GOTO,"Options",0,options_menu);
   main_menu->additem(MN_ACTION,"Level editor",0,0);
   main_menu->additem(MN_ACTION,"Credits",0,0);
   main_menu->additem(MN_ACTION,"Quit",0,0);
-  main_menu->additem(MN_HL,"",0,0);
 
   options_menu->additem(MN_LABEL,"Options",0,0);
   options_menu->additem(MN_HL,"",0,0);

diff --git a/src/title.cpp b/src/title.cpp
index e5d64e8..8bc8fa8 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -245,7 +245,7 @@ int title(void)
         {
           switch (main_menu->check())
             {
-            case 2:
+            case 0:
               done = 0;
               i = 0;
               if(level_subsets.num_items != 0)
@@ -322,17 +322,17 @@ int title(void)
               titletux.level_begin();
               update_time = st_get_ticks();
               break;
-            case 3:
+            case 1:
               update_load_save_game_menu(load_game_menu, true);
               break;
-            case 5:
+            case 3:
               done = 1;
               quit = leveleditor(1);
               break;
-            case 6:
+            case 4:
               display_credits();
               break;
-            case 7:
+            case 5:
               quit = 1;
               break;
             }