Update of /cvsroot/super-tux/supertux/src/screen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18090
Modified Files:
surface.cpp surface.h
Removed Files:
texture.cpp texture.h
Log Message:
- moved gradient fix over into surface.h, removed texture.h
Index: surface.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/surface.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- surface.cpp 14 Jun 2004 22:45:24 -0000 1.1
+++ surface.cpp 14 Jun 2004 22:56:17 -0000 1.2
@@ -170,9 +170,12 @@
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)
{
Index: surface.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/screen/surface.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- surface.h 14 Jun 2004 22:45:24 -0000 1.1
+++ surface.h 14 Jun 2004 22:56:17 -0000 1.2
@@ -97,7 +97,7 @@
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 */
--- texture.h DELETED ---
--- texture.cpp DELETED ---
|
