[Super-tux-commit] supertux/src leveleditor.cpp,1.64,1.65 player.cpp,1.61,1.62 player.h,1.39,1.40 re
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src leveleditor.cpp,1.64,1.65 player.cpp,1.61,1.62 player.h,1.39,1.40 resources.cpp,1.23,1.24
|
From: Ingo R. <gr...@us...> - 2004-04-25 16:13:31
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23156/src Modified Files: leveleditor.cpp player.cpp player.h resources.cpp Log Message: - moved tux completly to sprites Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- player.cpp 25 Apr 2004 14:27:49 -0000 1.61 +++ player.cpp 25 Apr 2004 16:07:50 -0000 1.62 @@ -29,41 +29,41 @@ #include "screen.h" Surface* tux_life; -std::vector<Surface*> tux_right; -std::vector<Surface*> tux_left; - -Surface* smalltux_jump_left; -Surface* smalltux_jump_right; -Surface* smalltux_stand_left; -Surface* smalltux_stand_right; -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* smalltux_star; +Sprite* smalltux_gameover; +Sprite* smalltux_star; Sprite* largetux_star; + +Sprite* smalltux_stand_left; +Sprite* smalltux_stand_right; +Sprite* smalltux_walk_right; +Sprite* smalltux_walk_left; +Sprite* smalltux_jump_left; +Sprite* smalltux_jump_right; +Sprite* smalltux_kick_left; +Sprite* smalltux_kick_right; +Sprite* smalltux_skid_left; +Sprite* smalltux_skid_right; +Sprite* smalltux_grab_left; +Sprite* smalltux_grab_right; + +Sprite* largetux_stand_left; +Sprite* largetux_stand_right; +Sprite* largetux_walk_right; +Sprite* largetux_walk_left; +Sprite* largetux_jump_right; +Sprite* largetux_jump_left; Sprite* largetux_kick_left; Sprite* largetux_kick_right; +Sprite* largetux_skid_right; +Sprite* largetux_skid_left; Sprite* largetux_grab_left; Sprite* largetux_grab_right; -Sprite* largetux_stand_left; -Sprite* largetux_stand_right; -Sprite* bigtux_right; -Sprite* bigtux_left; -Sprite* bigtux_right_jump; -Sprite* bigtux_left_jump; -Sprite* ducktux_right; -Sprite* ducktux_left; +Sprite* largetux_duck_right; +Sprite* largetux_duck_left; -Surface* skidtux_right; -Surface* skidtux_left; Surface* firetux_right[3]; Surface* firetux_left[3]; - Surface* bigfiretux_right[3]; Surface* bigfiretux_left[3]; Surface* bigfiretux_right_jump; @@ -73,9 +73,6 @@ Surface* skidfiretux_right; Surface* skidfiretux_left; -Surface* cape_right[2]; -Surface* cape_left[2]; - PlayerKeymap keymap; PlayerKeymap::PlayerKeymap() @@ -541,9 +538,9 @@ if (physic.get_velocity_y() != 0) { if (dir == RIGHT) - smalltux_jump_right->draw( base.x - scroll_x, base.y - 10); + smalltux_jump_right->draw(base.x - scroll_x, base.y); else - smalltux_jump_left->draw( base.x - scroll_x, base.y - 10); + smalltux_jump_left->draw(base.x - scroll_x, base.y); } else { @@ -557,9 +554,9 @@ else // moving { if (dir == RIGHT) - tux_right[(global_frame_counter/2) % tux_right.size()]->draw(base.x - scroll_x, base.y - 9); + smalltux_walk_right->draw(base.x - scroll_x, base.y); else - tux_left[(global_frame_counter/2) % tux_left.size()]->draw(base.x - scroll_x, base.y - 9); + smalltux_walk_left->draw(base.x - scroll_x, base.y); } } } @@ -602,33 +599,33 @@ else // walking { if (dir == RIGHT) - bigtux_right->draw(base.x - scroll_x, base.y); + largetux_walk_right->draw(base.x - scroll_x, base.y); else - bigtux_left->draw(base.x - scroll_x, base.y); + largetux_walk_left->draw(base.x - scroll_x, base.y); } } else { if (dir == RIGHT) - bigtux_right_jump->draw(base.x - scroll_x, base.y); + largetux_jump_right->draw(base.x - scroll_x, base.y); else - bigtux_left_jump->draw(base.x - scroll_x, base.y); + largetux_jump_left->draw(base.x - scroll_x, base.y); } } else { if (dir == RIGHT) - skidtux_right->draw(base.x - scroll_x - 8, base.y); + largetux_skid_right->draw(base.x - scroll_x - 8, base.y); else - skidtux_left->draw(base.x - scroll_x - 8, base.y); + largetux_skid_left->draw(base.x - scroll_x - 8, base.y); } } else { if (dir == RIGHT) - ducktux_right->draw(base.x - scroll_x, base.y); + largetux_duck_right->draw(base.x - scroll_x, base.y); else - ducktux_left->draw(base.x - scroll_x, base.y); + largetux_duck_left->draw(base.x - scroll_x, base.y); } } else Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- player.h 24 Apr 2004 13:12:12 -0000 1.39 +++ player.h 25 Apr 2004 16:08:00 -0000 1.40 @@ -75,38 +75,39 @@ class Sprite; extern Surface* tux_life; -extern std::vector<Surface*> tux_right; -extern std::vector<Surface*> tux_left; -extern Surface* smalltux_jump_left; -extern Surface* smalltux_jump_right; -extern Surface* smalltux_stand_left; -extern Surface* smalltux_stand_right; -extern Sprite* smalltux_skid_left; -extern Sprite* smalltux_skid_right; -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* smalltux_star; -extern Sprite* largetux_star; +extern Sprite* smalltux_gameover; +extern Sprite* smalltux_star; +extern Sprite* largetux_star; -extern Sprite* largetux_kick_left; -extern Sprite* largetux_kick_right; -extern Sprite* largetux_grab_left; -extern Sprite* largetux_grab_right; +extern Sprite* smalltux_stand_left; +extern Sprite* smalltux_stand_right; +extern Sprite* smalltux_walk_right; +extern Sprite* smalltux_walk_left; +extern Sprite* smalltux_jump_left; +extern Sprite* smalltux_jump_right; +extern Sprite* smalltux_kick_left; +extern Sprite* smalltux_kick_right; +extern Sprite* smalltux_skid_left; +extern Sprite* smalltux_skid_right; +extern Sprite* smalltux_grab_left; +extern Sprite* smalltux_grab_right; + +extern Sprite* largetux_stand_left; +extern Sprite* largetux_stand_right; +extern Sprite* largetux_walk_right; +extern Sprite* largetux_walk_left; +extern Sprite* largetux_jump_right; +extern Sprite* largetux_jump_left; +extern Sprite* largetux_kick_left; +extern Sprite* largetux_kick_right; +extern Sprite* largetux_skid_right; +extern Sprite* largetux_skid_left; +extern Sprite* largetux_grab_left; +extern Sprite* largetux_grab_right; +extern Sprite* largetux_duck_right; +extern Sprite* largetux_duck_left; -extern Sprite* bigtux_right; -extern Sprite* bigtux_left; -extern Sprite* bigtux_right_jump; -extern Sprite* bigtux_left_jump; -extern Sprite* ducktux_right; -extern Sprite* ducktux_left; -extern Surface* skidtux_right; -extern Surface* skidtux_left; extern Surface* firetux_right[3]; extern Surface* firetux_left[3]; extern Surface* bigfiretux_right[3]; @@ -117,10 +118,6 @@ extern Surface* duckfiretux_left; extern Surface* skidfiretux_right; extern Surface* skidfiretux_left; -extern Surface* cape_right[2]; -extern Surface* cape_left[2]; -extern Surface* bigcape_right[2]; -extern Surface* bigcape_left[2]; class Player { Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- leveleditor.cpp 24 Apr 2004 17:48:49 -0000 1.64 +++ leveleditor.cpp 25 Apr 2004 16:07:49 -0000 1.65 @@ -779,7 +779,7 @@ /* Draw the player: */ /* for now, the position is fixed at (100, 240) */ - tux_right[(global_frame_counter / 5) % 3]->draw( 100 - pos_x, 240); + largetux_walk_right->draw( 100 - pos_x, 240); } void le_checkevents() Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- resources.cpp 25 Apr 2004 11:55:39 -0000 1.23 +++ resources.cpp 25 Apr 2004 16:08:00 -0000 1.24 @@ -53,50 +53,43 @@ /* Tuxes: */ smalltux_star = sprite_manager->load("smalltux-star"); largetux_star = sprite_manager->load("largetux-star"); + smalltux_gameover = sprite_manager->load("smalltux-gameover"); - 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"); + smalltux_stand_left = sprite_manager->load("smalltux-stand-left"); + smalltux_stand_right = sprite_manager->load("smalltux-stand-right"); + smalltux_walk_left = sprite_manager->load("smalltux-walk-left"); + smalltux_walk_right = sprite_manager->load("smalltux-walk-right"); + smalltux_jump_left = sprite_manager->load("smalltux-jump-left"); + smalltux_jump_right = sprite_manager->load("smalltux-jump-right"); + smalltux_kick_left = sprite_manager->load("smalltux-kick-left"); + smalltux_kick_right = sprite_manager->load("smalltux-kick-right"); + smalltux_skid_left = sprite_manager->load("smalltux-skid-left"); + smalltux_skid_right = sprite_manager->load("smalltux-skid-right"); + smalltux_grab_left = sprite_manager->load("smalltux-grab-left"); + smalltux_grab_right = sprite_manager->load("smalltux-grab-right"); largetux_stand_left = sprite_manager->load("largetux-stand-left"); largetux_stand_right = sprite_manager->load("largetux-stand-right"); + largetux_walk_left = sprite_manager->load("largetux-walk-left"); + largetux_walk_right = sprite_manager->load("largetux-walk-right"); + largetux_jump_left = sprite_manager->load("largetux-jump-left"); + largetux_jump_right = sprite_manager->load("largetux-jump-right"); + largetux_kick_left = sprite_manager->load("largetux-kick-left"); + largetux_kick_right = sprite_manager->load("largetux-kick-right"); + largetux_skid_right = sprite_manager->load("largetux-skid-right"); + largetux_skid_left = sprite_manager->load("largetux-skid-left"); + largetux_grab_left = sprite_manager->load("largetux-grab-left"); + largetux_grab_right = sprite_manager->load("largetux-grab-right"); + largetux_duck_left = sprite_manager->load("largetux-duck-left"); + largetux_duck_right = sprite_manager->load("largetux-duck-right"); - smalltux_gameover = sprite_manager->load("smalltux-gameover"); - - smalltux_skid_left = sprite_manager->load("smalltux-skid-left"); - smalltux_skid_right = sprite_manager->load("smalltux-skid-right"); - - smalltux_stand_left = new Surface(datadir + "/images/shared/smalltux-left-6.png", USE_ALPHA); - smalltux_stand_right = new Surface(datadir + "/images/shared/smalltux-right-6.png", USE_ALPHA); - - smalltux_jump_left = new Surface(datadir + "/images/shared/smalltux-jump-left.png", USE_ALPHA); - smalltux_jump_right = new Surface(datadir + "/images/shared/smalltux-jump-right.png", USE_ALPHA); - - tux_right.resize(8); - tux_right[0] = new Surface(datadir + "/images/shared/smalltux-right-1.png", USE_ALPHA); - tux_right[1] = new Surface(datadir + "/images/shared/smalltux-right-2.png", USE_ALPHA); - tux_right[2] = new Surface(datadir + "/images/shared/smalltux-right-3.png", USE_ALPHA); - tux_right[3] = new Surface(datadir + "/images/shared/smalltux-right-4.png", USE_ALPHA); - tux_right[4] = new Surface(datadir + "/images/shared/smalltux-right-5.png", USE_ALPHA); - tux_right[5] = new Surface(datadir + "/images/shared/smalltux-right-6.png", USE_ALPHA); - tux_right[6] = new Surface(datadir + "/images/shared/smalltux-right-7.png", USE_ALPHA); - tux_right[7] = new Surface(datadir + "/images/shared/smalltux-right-8.png", USE_ALPHA); + duckfiretux_right = new Surface(datadir + + "/images/shared/duckfiretux-right.png", + USE_ALPHA); - tux_left.resize(8); - tux_left[0] = new Surface(datadir + "/images/shared/smalltux-left-1.png", USE_ALPHA); - tux_left[1] = new Surface(datadir + "/images/shared/smalltux-left-2.png", USE_ALPHA); - tux_left[2] = new Surface(datadir + "/images/shared/smalltux-left-3.png", USE_ALPHA); - tux_left[3] = new Surface(datadir + "/images/shared/smalltux-left-4.png", USE_ALPHA); - tux_left[4] = new Surface(datadir + "/images/shared/smalltux-left-5.png", USE_ALPHA); - tux_left[5] = new Surface(datadir + "/images/shared/smalltux-left-6.png", USE_ALPHA); - tux_left[6] = new Surface(datadir + "/images/shared/smalltux-left-7.png", USE_ALPHA); - tux_left[7] = new Surface(datadir + "/images/shared/smalltux-left-8.png", USE_ALPHA); + duckfiretux_left = new Surface(datadir + + "/images/shared/duckfiretux-left.png", + USE_ALPHA); firetux_right[0] = new Surface(datadir + "/images/shared/firetux-right-0.png", USE_ALPHA); firetux_right[1] = new Surface(datadir + "/images/shared/firetux-right-1.png", USE_ALPHA); @@ -106,25 +99,6 @@ firetux_left[1] = new Surface(datadir + "/images/shared/firetux-left-1.png", USE_ALPHA); firetux_left[2] = new Surface(datadir + "/images/shared/firetux-left-2.png", USE_ALPHA); - - cape_right[0] = new Surface(datadir + "/images/shared/cape-right-0.png", - USE_ALPHA); - - cape_right[1] = new Surface(datadir + "/images/shared/cape-right-1.png", - USE_ALPHA); - - cape_left[0] = new Surface(datadir + "/images/shared/cape-left-0.png", - USE_ALPHA); - - cape_left[1] = new Surface(datadir + "/images/shared/cape-left-1.png", - USE_ALPHA); - - bigtux_right = sprite_manager->load("largetux-walk-right"); - bigtux_left = sprite_manager->load("largetux-walk-left"); - - bigtux_left_jump = sprite_manager->load("largetux-jump-left"); - bigtux_right_jump = sprite_manager->load("largetux-jump-right"); - bigfiretux_right[0] = new Surface(datadir + "/images/shared/bigfiretux-right-0.png", USE_ALPHA); @@ -147,25 +121,6 @@ bigfiretux_left_jump = new Surface(datadir + "/images/shared/bigfiretux-left-jump.png", USE_ALPHA); - ducktux_left = sprite_manager->load("largetux-duck-left"); - ducktux_right = sprite_manager->load("largetux-duck-right"); - - skidtux_right = new Surface(datadir + - "/images/shared/largetux-skid-right.png", - USE_ALPHA); - - skidtux_left = new Surface(datadir + - "/images/shared/largetux-skid-left.png", - USE_ALPHA); - - duckfiretux_right = new Surface(datadir + - "/images/shared/duckfiretux-right.png", - USE_ALPHA); - - duckfiretux_left = new Surface(datadir + - "/images/shared/duckfiretux-left.png", - USE_ALPHA); - skidfiretux_right = new Surface(datadir + "/images/shared/skidfiretux-right.png", USE_ALPHA); @@ -285,32 +240,10 @@ int i; free_special_gfx(); + free_badguy_gfx(); delete smalltux_gameover; - for (i = 0; i < 3; i++) - { - delete tux_right[i]; - delete tux_left[i]; - } - - delete bigtux_right_jump; - delete bigtux_left_jump; - - for (i = 0; i < 2; i++) - { - delete cape_right[i]; - delete cape_left[i]; - } - - delete ducktux_left; - delete ducktux_right; - - delete skidtux_left; - delete skidtux_right; - - free_badguy_gfx(); - delete img_water; for (i = 0; i < 3; i++) delete img_waves[i]; |
