Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19902
Modified Files:
menu.cpp menu.h setup.cpp title.cpp
Log Message:
removed title from main menu
Index: menu.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- menu.cpp 9 Apr 2004 02:19:09 -0000 1.24
+++ menu.cpp 10 Apr 2004 14:53:42 -0000 1.25
@@ -293,7 +293,6 @@
}
}
-/* Check, if the value of the active menu item has changed. */
int
Menu::check()
{
Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- title.cpp 10 Apr 2004 11:56:19 -0000 1.22
+++ title.cpp 10 Apr 2004 14:53:43 -0000 1.23
@@ -245,7 +245,7 @@
{
switch (main_menu->check())
{
- case 2:
+ case 0:
done = 0;
i = 0;
if(level_subsets.num_items != 0)
@@ -322,17 +322,17 @@
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;
}
Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- setup.cpp 9 Apr 2004 00:49:47 -0000 1.23
+++ setup.cpp 10 Apr 2004 14:53:43 -0000 1.24
@@ -359,16 +359,13 @@
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);
Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- menu.h 3 Apr 2004 13:31:14 -0000 1.25
+++ menu.h 10 Apr 2004 14:53:43 -0000 1.26
@@ -79,6 +79,8 @@
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);
|