[Super-tux-commit] supertux/src/screen drawing_context.cpp,1.5,1.6 drawing_context.h,1.4,1.5 texture
Brought to you by:
wkendrick
Menu
▾
▴
[Super-tux-commit] supertux/src/screen drawing_context.cpp,1.5,1.6 drawing_context.h,1.4,1.5 texture.cpp,1.2,1.3 texture.h,1.3,1.4
|
From: Ricardo C. <rm...@us...> - 2004-06-08 22:22:23
|
Update of /cvsroot/super-tux/supertux/src/screen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1493/src/screen Modified Files: drawing_context.cpp drawing_context.h texture.cpp texture.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: drawing_context.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/drawing_context.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- drawing_context.cpp 31 May 2004 13:43:31 -0000 1.5 +++ drawing_context.cpp 8 Jun 2004 22:21:11 -0000 1.6 @@ -35,7 +35,7 @@ void DrawingContext::draw_surface(const Surface* surface, const Vector& position, - int layer, uint32_t drawing_effect) + int layer, Uint32 drawing_effect) { assert(surface != 0); @@ -52,7 +52,7 @@ void DrawingContext::draw_surface_part(const Surface* surface, const Vector& source, - const Vector& size, const Vector& dest, int layer, uint32_t drawing_effect) + const Vector& size, const Vector& dest, int layer, Uint32 drawing_effect) { assert(surface != 0); Index: drawing_context.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/drawing_context.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- drawing_context.h 2 Jun 2004 23:33:34 -0000 1.4 +++ drawing_context.h 8 Jun 2004 22:21:11 -0000 1.5 @@ -19,7 +19,6 @@ #ifndef __DRAWINGCONTEXT_H__ #define __DRAWINGCONTEXT_H__ -#include <stdint.h> #include <vector> #include <string> #include "vector.h" @@ -72,11 +71,11 @@ /** Adds a drawing request for a surface into the request list */ void draw_surface(const Surface* surface, const Vector& position, int layer, - uint32_t drawing_effect = NONE_EFFECT); + Uint32 drawing_effect = NONE_EFFECT); /** Adds a drawing request for part of a surface */ void draw_surface_part(const Surface* surface, const Vector& source, const Vector& size, const Vector& dest, int layer, - uint32_t drawing_effect = NONE_EFFECT); + Uint32 drawing_effect = NONE_EFFECT); /** draws a text */ void draw_text(Font* font, const std::string& text, const Vector& position, int layer); @@ -149,7 +148,7 @@ struct DrawingRequest { int layer; - uint32_t drawing_effect; + Uint32 drawing_effect; RequestType type; Vector pos; Index: texture.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/texture.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- texture.cpp 31 May 2004 13:02:21 -0000 1.2 +++ texture.cpp 8 Jun 2004 22:21:11 -0000 1.3 @@ -448,7 +448,7 @@ } int -SurfaceOpenGL::draw(float x, float y, Uint8 alpha, uint32_t effect) +SurfaceOpenGL::draw(float x, float y, Uint8 alpha, Uint32 effect) { float pw = power_of_two(w); float ph = power_of_two(h); @@ -503,7 +503,7 @@ } int -SurfaceOpenGL::draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, uint32_t effect) +SurfaceOpenGL::draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, Uint32 effect) { float pw = power_of_two(int(this->w)); float ph = power_of_two(int(this->h)); @@ -619,7 +619,7 @@ } int -SurfaceSDL::draw(float x, float y, Uint8 alpha, uint32_t effect) +SurfaceSDL::draw(float x, float y, Uint8 alpha, Uint32 effect) { SDL_Rect dest; @@ -671,7 +671,7 @@ } int -SurfaceSDL::draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, uint32_t effect) +SurfaceSDL::draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, Uint32 effect) { SDL_Rect src, dest; Index: texture.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/screen/texture.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- texture.h 31 May 2004 13:02:21 -0000 1.3 +++ texture.h 8 Jun 2004 22:21:11 -0000 1.4 @@ -27,7 +27,6 @@ #include <SDL_opengl.h> #endif -#include <stdint.h> #include <list> #include "screen.h" #include "vector.h" @@ -116,8 +115,8 @@ virtual ~SurfaceImpl(); /** Return 0 on success, -2 if surface needs to be reloaded */ - virtual int draw(float x, float y, Uint8 alpha, uint32_t effect = NONE_EFFECT) = 0; - virtual int draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, uint32_t effect = NONE_EFFECT) = 0; + virtual int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT) = 0; + virtual int draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, Uint32 effect = NONE_EFFECT) = 0; #if 0 virtual int draw_stretched(float x, float y, int w, int h, Uint8 alpha, bool update) = 0; #endif @@ -134,8 +133,8 @@ SurfaceSDL(const std::string& file, int x, int y, int w, int h, int use_alpha); virtual ~SurfaceSDL(); - int draw(float x, float y, Uint8 alpha, uint32_t effect = NONE_EFFECT); - int draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, uint32_t effect = NONE_EFFECT); + int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT); + int draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, Uint32 effect = NONE_EFFECT); #if 0 int draw_stretched(float x, float y, int w, int h, Uint8 alpha); #endif @@ -153,8 +152,8 @@ SurfaceOpenGL(const std::string& file, int x, int y, int w, int h, int use_alpha); virtual ~SurfaceOpenGL(); - int draw(float x, float y, Uint8 alpha, uint32_t effect = NONE_EFFECT); - int draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, uint32_t effect = NONE_EFFECT); + int draw(float x, float y, Uint8 alpha, Uint32 effect = NONE_EFFECT); + int draw_part(float sx, float sy, float x, float y, float w, float h, Uint8 alpha, Uint32 effect = NONE_EFFECT); #if 0 int draw_stretched(float x, float y, int w, int h, Uint8 alpha); #endif |
