X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fvideo%2Fsurface.h;h=069119562f7b59f2564f2cbd15c5413dc9a77170;hb=133d94d5b145f325c38c8c15c9ea561bfffb092d;hp=ef311d8a5d367189157095a6b3f58f568f34c9b5;hpb=f1e420934b6afd3c65183db7d87018cbfbde1221;p=supertux.git

diff --git a/lib/video/surface.h b/lib/video/surface.h
index ef311d8a5..069119562 100644
--- a/lib/video/surface.h
+++ b/lib/video/surface.h
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #ifndef SUPERTUX_TEXTURE_H
 #define SUPERTUX_TEXTURE_H
 
@@ -25,13 +24,13 @@
 #include <list>
 
 #ifndef NOOPENGL
-#include "SDL_opengl.h"
+#include <SDL_opengl.h>
 #endif
 
 #include "SDL.h"
 
-#include "../math/vector.h"
-#include "../video/screen.h"
+#include "math/vector.h"
+#include "video/screen.h"
 
 namespace SuperTux
   {
@@ -72,6 +71,10 @@ namespace SuperTux
       ConstructorType type;
       SDL_Surface* surface;
       std::string file;
+
+      struct Filter { int type; Color color; };
+      std::vector<Filter> applied_filters;
+
       bool use_alpha;
       int x;
       int y;
@@ -118,8 +121,6 @@ namespace SuperTux
       /** Reload the surface, which is necesarry in case of a mode swich */
       void reload();
 
-      void resize(int widht, int height);
-
       void apply_filter(int filter, Color color = Color(0,0,0));
     };
 
@@ -144,8 +145,6 @@ namespace SuperTux
       virtual int draw_stretched(float x, float y, int w, int h, Uint8 alpha, Uint32 effect = NONE_EFFECT) = 0;
 
 
-      int resize(int w_, int h_);
-
       SDL_Surface* get_sdl_surface() const; // @evil@ try to avoid this function
 
       virtual void apply_filter(int filter, Color color = Color(0,0,0)) = 0;
@@ -156,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();