Had to change the #includes of dependend headers from "dir/header.h" to "../dir...

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

diff --git a/lib/video/surface.cpp b/lib/video/surface.cpp
index e423aa3..7142278 100644 (file)
--- a/lib/video/surface.cpp
+++ b/lib/video/surface.cpp
@@ -25,9 +25,11 @@
 #include "SDL.h"
 #include "SDL_image.h"
 
-#include "video/surface.h"
-#include "app/globals.h"
-#include "app/setup.h"
+#include "../video/surface.h"
+#include "../app/globals.h"
+#include "../app/setup.h"
+
+using namespace SuperTux;
 
 Surface::Surfaces Surface::surfaces;
 
@@ -328,7 +330,7 @@ sdl_surface_from_file(const std::string& file, bool use_alpha)
 }
 
 SDL_Surface*
-sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, bool use_alpha)
+SuperTux::sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, bool use_alpha)
 {
   SDL_Surface* sdl_surface;
   Uint32 saved_flags;