[Super-tux-commit] supertux/src sprite.cpp,1.14,1.15 sprite.h,1.11,1.12 tile.h,1.25,1.26
Brought to you by:
wkendrick
From: Ricardo C. <rm...@us...> - 2004-06-08 22:22:04
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1493/src Modified Files: sprite.cpp sprite.h tile.h Log Message: Replaced uint32_t by Uint32. Has to be done, since *BSD do not ship with stdint.h. Please, remove stdint.h checking from the automake. Index: tile.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- tile.h 30 May 2004 17:54:23 -0000 1.25 +++ tile.h 8 Jun 2004 22:21:11 -0000 1.26 @@ -24,7 +24,6 @@ #include <set> #include <map> #include <vector> -#include <stdint.h> #include "screen/texture.h" #include "globals.h" #include "lispreader.h" @@ -76,7 +75,7 @@ }; /** tile attributes */ - uint32_t attributes; + Uint32 attributes; /** General purpose data attached to a tile (content of a box, type of coin)*/ int data; Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sprite.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- sprite.cpp 31 May 2004 13:02:21 -0000 1.14 +++ sprite.cpp 8 Jun 2004 22:21:11 -0000 1.15 @@ -75,7 +75,7 @@ void Sprite::draw(DrawingContext& context, const Vector& pos, int layer, - uint32_t drawing_effect) + Uint32 drawing_effect) { time = SDL_GetTicks(); unsigned int frame = get_current_frame(); Index: sprite.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sprite.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- sprite.h 31 May 2004 13:02:21 -0000 1.11 +++ sprite.h 8 Jun 2004 22:21:11 -0000 1.12 @@ -57,7 +57,7 @@ /** Update the sprite and process to the next frame */ void update(float delta); void draw(DrawingContext& context, const Vector& pos, int layer, - uint32_t drawing_effect = NONE_EFFECT); + Uint32 drawing_effect = NONE_EFFECT); int get_current_frame() const; float get_fps() { return fps; } ; |