Update of /cvsroot/super-tux/supertux/src/screen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24191/screen
Modified Files:
texture.cpp
Log Message:
- fixed argument-shadowing issue 'this->w vs w'
Index: texture.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/texture.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- texture.cpp 13 Jun 2004 18:31:37 -0000 1.8
+++ texture.cpp 13 Jun 2004 22:42:13 -0000 1.9
@@ -449,9 +449,10 @@
h = sdl_surface->h;
}
-SurfaceOpenGL::SurfaceOpenGL(const std::string& file, int x, int y, int w, int h, int use_alpha)
+SurfaceOpenGL::SurfaceOpenGL(const std::string& file_, int x_, int y_, int w_, int h_, int use_alpha_)
{
- sdl_surface = sdl_surface_part_from_file(file,x,y,w,h,use_alpha);
+ sdl_surface = sdl_surface_part_from_file(file_,x_,y_,w_,h_,use_alpha_);
+
create_gl(sdl_surface, &gl_texture);
w = sdl_surface->w;
|
