- fixed gradient crash bug

SVN-Revision: 1489

diff --git a/src/screen/texture.cpp b/src/screen/texture.cpp
index addc0e0..a4767f5 100644 (file)
--- a/src/screen/texture.cpp
+++ b/src/screen/texture.cpp
@@ -170,9 +170,12 @@ Surface::Surface(const std::string& file, int x, int y, int w, int h, int use_al
   surfaces.push_back(this);
 }
 
-Surface::Surface(Color top_background, Color bottom_background, int w, int h)
-    : data(top_background, bottom_background, w, h), w(0), h(0)
+Surface::Surface(Color top_background, Color bottom_background, int w_, int h_)
+    : data(top_background, bottom_background, 0, 0), w(0), h(0)
 {
+  // FIXME: Gradient surfaces currently don't accept width/height
+  //        If nonzero values are passed to data.create(), supertux
+  //        crashes.
   impl = data.create();
   if (impl)
   {

diff --git a/src/screen/texture.h b/src/screen/texture.h
index 6fe26e3..79899d9 100644 (file)
--- a/src/screen/texture.h
+++ b/src/screen/texture.h
@@ -97,7 +97,7 @@ public:
   Surface(SDL_Surface* surf, int use_alpha);  
   Surface(const std::string& file, int use_alpha);  
   Surface(const std::string& file, int x, int y, int w, int h, int use_alpha);
-  Surface(Color top_gradient, Color bottom_gradient, int w, int h);
+  Surface(Color top_gradient, Color bottom_gradient, int w_, int h_);
   ~Surface();
   
   /** Reload the surface, which is necesarry in case of a mode swich */