- fixes image region tiling bug (by Matze)

SVN-Revision: 2175

diff --git a/lib/video/surface.cpp b/lib/video/surface.cpp
index fafdec8..3c98b30 100644 (file)
--- a/lib/video/surface.cpp
+++ b/lib/video/surface.cpp
@@ -166,8 +166,8 @@ Surface::Surface(const std::string& file, bool use_alpha)
   surfaces.push_back(this);
 }
 
-Surface::Surface(const std::string& file, int x, int y, int w, int h, bool use_alpha)
-    : data(file, x, y, w, h, use_alpha), w(0), h(0)
+Surface::Surface(const std::string& file, int x, int y, int w_, int h_, bool use_alpha)
+    : data(file, x, y, w_, h_, use_alpha), w(0), h(0)
 {
   impl = data.create();
   if (impl)

diff --git a/lib/video/surface.h b/lib/video/surface.h
index d13d9dc..0691195 100644 (file)
--- a/lib/video/surface.h
+++ b/lib/video/surface.h
@@ -155,7 +155,7 @@ namespace SuperTux
     public:
       SurfaceSDL(SDL_Surface* surf, bool use_alpha);
       SurfaceSDL(const std::string& file, bool use_alpha);
-      SurfaceSDL(const std::string& file, int x, int y, int w, int h, bool use_alpha);
+      SurfaceSDL(const std::string& file, int x, int y, int w_, int h_, bool use_alpha);
       SurfaceSDL(Color top_gradient, Color bottom_gradient, int w, int h);
       virtual ~SurfaceSDL();