new editor image for gradients

[supertux.git] / lib / video / surface.cpp

diff --git a/lib/video/surface.cpp b/lib/video/surface.cpp
index 5f51c87..3c98b30 100644 (file)
--- a/lib/video/surface.cpp
+++ b/lib/video/surface.cpp
@@ -27,10 +27,10 @@
 #include "SDL.h"
 #include "SDL_image.h"
 
-#include "../video/surface.h"
-#include "../video/screen.h"
-#include "../app/globals.h"
-#include "../app/setup.h"
+#include "video/surface.h"
+#include "video/screen.h"
+#include "app/globals.h"
+#include "app/setup.h"
 
 using namespace SuperTux;
 
@@ -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)