[Super-tux-commit] supertux/src level.cpp,1.46,1.47 level.h,1.35,1.36 menu.cpp,1.52,1.53 menu.h,1.45
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src level.cpp,1.46,1.47 level.h,1.35,1.36 menu.cpp,1.52,1.53 menu.h,1.45,1.46 player.cpp,1.56,1.57 player.h,1.36,1.37 resources.cpp,1.18,1.19
|
From: Ingo R. <gr...@us...> - 2004-04-24 12:11:20
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23606 Modified Files: level.cpp level.h menu.cpp menu.h player.cpp player.h resources.cpp Log Message: - fixed bug in Menu::check() - added grab/kick tux to resources - added flag to use endsequence or not Index: menu.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- menu.cpp 24 Apr 2004 09:32:31 -0000 1.52 +++ menu.cpp 24 Apr 2004 12:11:10 -0000 1.53 @@ -223,7 +223,6 @@ pos_x = screen->w/2; pos_y = screen->h/2; has_backitem = false; - last_id = 0; arrange_left = 0; active_item = 0; effect.init(false); @@ -241,12 +240,9 @@ if(kind_ == MN_BACK) has_backitem = true; - if(id == -1 && item.size() == (unsigned)last_id) - { - id = last_id; - last_id++; - } - + if(id == -1) + id = int(item.size()); + additem(MenuItem::create(kind_, text_.c_str(), toggle_, menu_, id, int_p)); } @@ -404,30 +400,10 @@ int Menu::check() { - return item[hit_item].id; - /* - if (item.size() != 0) - { - if((item[active_item].kind == MN_ACTION - || item[active_item].kind == MN_TEXTFIELD - || item[active_item].kind == MN_NUMFIELD) - && item[active_item].toggled) - { - item[active_item].toggled = false; - Menu::set_current(0); - return active_item; - } - else if(item[active_item].kind == MN_TOGGLE - || item[active_item].kind == MN_GOTO) - { - return active_item; - } - else - return -1; - } + if (hit_item != -1) + return item[hit_item].id; else return -1; - */ } void Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- player.h 22 Apr 2004 20:14:49 -0000 1.36 +++ player.h 24 Apr 2004 12:11:11 -0000 1.37 @@ -86,6 +86,17 @@ extern Sprite* smalltux_gameover; extern Sprite* largetux_stand_left; extern Sprite* largetux_stand_right; + +extern Sprite* smalltux_kick_left; +extern Sprite* smalltux_kick_right; +extern Sprite* smalltux_grab_left; +extern Sprite* smalltux_grab_right; + +extern Sprite* largetux_kick_left; +extern Sprite* largetux_kick_right; +extern Sprite* largetux_grab_left; +extern Sprite* largetux_grab_right; + extern Sprite* bigtux_right; extern Sprite* bigtux_left; extern Sprite* bigtux_right_jump; Index: menu.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/menu.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- menu.h 24 Apr 2004 09:32:31 -0000 1.45 +++ menu.h 24 Apr 2004 12:11:10 -0000 1.46 @@ -138,7 +138,6 @@ int pos_x; int pos_y; bool has_backitem; - int last_id; /** input event for the menu (up, down, left, right, etc.) */ MenuAction menuaction; Index: level.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- level.h 21 Apr 2004 23:37:40 -0000 1.35 +++ level.h 24 Apr 2004 12:11:10 -0000 1.36 @@ -87,6 +87,7 @@ int start_pos_x; int start_pos_y; int endpos; + bool use_endsequence; float gravity; std::vector<BadGuyData> badguy_data; Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- player.cpp 22 Apr 2004 20:14:49 -0000 1.56 +++ player.cpp 24 Apr 2004 12:11:10 -0000 1.57 @@ -38,6 +38,17 @@ Sprite* smalltux_gameover; Sprite* smalltux_skid_left; Sprite* smalltux_skid_right; + +Sprite* smalltux_kick_left; +Sprite* smalltux_kick_right; +Sprite* smalltux_grab_left; +Sprite* smalltux_grab_right; + +Sprite* largetux_kick_left; +Sprite* largetux_kick_right; +Sprite* largetux_grab_left; +Sprite* largetux_grab_right; + Sprite* largetux_stand_left; Sprite* largetux_stand_right; Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- level.cpp 22 Apr 2004 11:17:34 -0000 1.46 +++ level.cpp 24 Apr 2004 12:11:10 -0000 1.47 @@ -241,6 +241,7 @@ bkgd_bottom.green = 255; bkgd_bottom.blue = 255; endpos = 0; + use_endsequence = false; for(int i = 0; i < 15; ++i) { @@ -305,6 +306,7 @@ { LispReader reader(lisp_cdr(root_obj)); reader.read_int("version", &version); + reader.read_bool("use-endsequence", &use_endsequence); reader.read_int("width", &width); if (!reader.read_int("start_pos_x", &start_pos_x)) start_pos_x = 100; if (!reader.read_int("start_pos_y", &start_pos_y)) start_pos_y = 170; @@ -493,7 +495,10 @@ // Mark the end position of this level! // FIXME: -10 is a rather random value, we still need some kind of // real levelend gola - endpos = 32*(width-20); + if (use_endsequence) + endpos = 32*(width-20); + else + endpos = 32*(width-15); fclose(fi); return 0; Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- resources.cpp 22 Apr 2004 21:24:29 -0000 1.18 +++ resources.cpp 24 Apr 2004 12:11:11 -0000 1.19 @@ -46,6 +46,16 @@ sprite_manager = new SpriteManager(datadir + "/supertux.strf"); /* Tuxes: */ + smalltux_kick_left = sprite_manager->load("smalltux-kick-left"); + smalltux_kick_right = sprite_manager->load("smalltux-kick-right"); + smalltux_grab_left = sprite_manager->load("smalltux-grab-left"); + smalltux_grab_right = sprite_manager->load("smalltux-grab-right"); + + largetux_kick_left = sprite_manager->load("largetux-kick-left"); + largetux_kick_right = sprite_manager->load("largetux-kick-right"); + largetux_grab_left = sprite_manager->load("largetux-grab-left"); + largetux_grab_right = sprite_manager->load("largetux-grab-right"); + largetux_stand_left = sprite_manager->load("largetux-stand-left"); largetux_stand_right = sprite_manager->load("largetux-stand-right"); |
