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

diff --git a/lib/video/surface.h b/lib/video/surface.h
index 1491e84fa..069119562 100644
--- a/lib/video/surface.h
+++ b/lib/video/surface.h
@@ -29,8 +29,8 @@
 
 #include "SDL.h"
 
-#include "../math/vector.h"
-#include "../video/screen.h"
+#include "math/vector.h"
+#include "video/screen.h"
 
 namespace SuperTux
   {
@@ -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();