From e8379003db803044d7af64b2b56984ae82e7114a Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Sun, 13 Jun 2004 22:42:13 +0000 Subject: [PATCH] - fixed argument-shadowing issue 'this->w vs w' SVN-Revision: 1484 --- src/screen/texture.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/screen/texture.cpp b/src/screen/texture.cpp index 370423409..addc0e006 100644 --- a/src/screen/texture.cpp +++ b/src/screen/texture.cpp @@ -449,9 +449,10 @@ SurfaceOpenGL::SurfaceOpenGL(const std::string& file, int use_alpha) 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; -- 2.11.0