[Super-tux-commit] supertux/src gameloop.cpp,1.76,1.77 player.cpp,1.41,1.42 player.h,1.27,1.28 resou
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src gameloop.cpp,1.76,1.77 player.cpp,1.41,1.42 player.h,1.27,1.28 resources.cpp,1.10,1.11 sound.h,1.21,1.22
|
From: Ingo R. <gr...@us...> - 2004-04-18 20:36:16
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31092 Modified Files: gameloop.cpp player.cpp player.h resources.cpp sound.h Log Message: - added new bigtux Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- player.cpp 18 Apr 2004 15:08:27 -0000 1.41 +++ player.cpp 18 Apr 2004 20:36:00 -0000 1.42 @@ -17,6 +17,7 @@ #include "defines.h" #include "scene.h" #include "tile.h" +#include "sprite.h" #include "screen.h" Surface* tux_life; @@ -27,10 +28,10 @@ Surface* smalltux_stand_left; Surface* smalltux_stand_right; -Surface* bigtux_right[3]; -Surface* bigtux_left[3]; -Surface* bigtux_right_jump; -Surface* bigtux_left_jump; +Sprite* bigtux_right; +Sprite* bigtux_left; +Sprite* bigtux_right_jump; +Sprite* bigtux_left_jump; Surface* ducktux_right; Surface* ducktux_left; Surface* skidtux_right; @@ -597,45 +598,27 @@ { if (!skidding_timer.started()) { - if (!jumping || physic.get_velocity_y() > 0) + if (physic.get_velocity_y() == 0) { if (dir == RIGHT) - { - bigtux_right[frame_]->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_right->draw(base.x- scroll_x - 8, base.y); else - { - bigtux_left[frame_]->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_left->draw(base.x- scroll_x - 8, base.y); } else { if (dir == RIGHT) - { - bigtux_right_jump->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_right_jump->draw(base.x- scroll_x - 8, base.y); else - { - bigtux_left_jump->draw( - base.x- scroll_x - 8, base.y); - } + bigtux_left_jump->draw(base.x- scroll_x - 8, base.y); } } else { if (dir == RIGHT) - { - skidtux_right->draw( - base.x- scroll_x - 8, base.y); - } + skidtux_right->draw(base.x- scroll_x - 8, base.y); else - { - skidtux_left->draw( - base.x- scroll_x - 8, base.y); - } + skidtux_left->draw(base.x- scroll_x - 8, base.y); } } else Index: player.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- player.h 16 Apr 2004 16:52:18 -0000 1.27 +++ player.h 18 Apr 2004 20:36:00 -0000 1.28 @@ -60,6 +60,8 @@ void player_input_init(player_input_type* pplayer_input); +class Sprite; + extern Surface* tux_life; extern std::vector<Surface*> tux_right; extern std::vector<Surface*> tux_left; @@ -67,10 +69,10 @@ extern Surface* smalltux_jump_right; extern Surface* smalltux_stand_left; extern Surface* smalltux_stand_right; -extern Surface* bigtux_right[3]; -extern Surface* bigtux_left[3]; -extern Surface* bigtux_right_jump; -extern Surface* bigtux_left_jump; +extern Sprite* bigtux_right; +extern Sprite* bigtux_left; +extern Sprite* bigtux_right_jump; +extern Sprite* bigtux_left_jump; extern Surface* ducktux_right; extern Surface* ducktux_left; extern Surface* skidtux_right; Index: sound.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sound.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- sound.h 24 Mar 2004 14:35:11 -0000 1.21 +++ sound.h 18 Apr 2004 20:36:01 -0000 1.22 @@ -71,8 +71,10 @@ #include <SDL_mixer.h> /* variables for stocking the sound and music */ -extern Mix_Chunk * sounds[NUM_SOUNDS]; -extern Mix_Music * level_song, * level_song_fast, * herring_song; +extern Mix_Chunk* sounds[NUM_SOUNDS]; +extern Mix_Music* level_song; +extern Mix_Music* level_song_fast; +extern Mix_Music* herring_song; /* functions handling the sound and music */ int open_audio(int frequency, Uint16 format, int channels, int chunksize); Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- gameloop.cpp 18 Apr 2004 13:42:14 -0000 1.76 +++ gameloop.cpp 18 Apr 2004 20:36:00 -0000 1.77 @@ -63,6 +63,8 @@ fps_timer.init(true); frame_timer.init(true); + delete world; + if (st_gl_mode == ST_GL_LOAD_LEVEL_FILE) { world = new World(subset); Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- resources.cpp 18 Apr 2004 13:42:15 -0000 1.10 +++ resources.cpp 18 Apr 2004 20:36:01 -0000 1.11 @@ -75,27 +75,11 @@ cape_left[1] = new Surface(datadir + "/images/shared/cape-left-1.png", USE_ALPHA); - bigtux_right[0] = new Surface(datadir + "/images/shared/bigtux-right-0.png", - USE_ALPHA); - - bigtux_right[1] = new Surface(datadir + "/images/shared/bigtux-right-1.png", - USE_ALPHA); - - bigtux_right[2] = new Surface(datadir + "/images/shared/bigtux-right-2.png", - USE_ALPHA); - - bigtux_right_jump = new Surface(datadir + "/images/shared/bigtux-right-jump.png", USE_ALPHA); - - bigtux_left[0] = new Surface(datadir + "/images/shared/bigtux-left-0.png", - USE_ALPHA); - - bigtux_left[1] = new Surface(datadir + "/images/shared/bigtux-left-1.png", - USE_ALPHA); - - bigtux_left[2] = new Surface(datadir + "/images/shared/bigtux-left-2.png", - USE_ALPHA); + bigtux_right = sprite_manager->load("largetux-walk-right"); + bigtux_left = sprite_manager->load("largetux-walk-left"); - bigtux_left_jump = new Surface(datadir + "/images/shared/bigtux-left-jump.png", USE_ALPHA); + bigtux_left_jump = sprite_manager->load("largetux-jump-left"); + bigtux_right_jump = sprite_manager->load("largetux-jump-right"); bigcape_right[0] = new Surface(datadir + "/images/shared/bigcape-right-0.png", USE_ALPHA); @@ -302,8 +286,6 @@ { delete tux_right[i]; delete tux_left[i]; - delete bigtux_right[i]; - delete bigtux_left[i]; } delete bigtux_right_jump; |
