Copy the palette of indexed images, fixes issue with the boats worldmap path which...

[supertux.git] / src / video / drawing_context.cpp

diff --git a/src/video/drawing_context.cpp b/src/video/drawing_context.cpp
index 070cffb..e831fe0 100644 (file)
--- a/src/video/drawing_context.cpp
+++ b/src/video/drawing_context.cpp
@@ -19,9 +19,9 @@
 
 #include "video/drawing_context.hpp"
 
-#include "obstack/obstackpp.hpp"
 #include "supertux/gameconfig.hpp"
 #include "supertux/globals.hpp"
+#include "util/obstackpp.hpp"
 #include "video/drawing_request.hpp"
 #include "video/lightmap.hpp"
 #include "video/renderer.hpp"
@@ -73,8 +73,8 @@ DrawingContext::init_renderer()
   delete renderer;
   delete lightmap;
 
-  renderer = new_renderer();
-  lightmap = new_lightmap();
+  renderer = VideoSystem::new_renderer();
+  lightmap = VideoSystem::new_lightmap();
 }
 
 void
@@ -231,14 +231,14 @@ DrawingContext::draw_filled_rect(const Vector& topleft, const Vector& size,
 }
 
 void
-DrawingContext::draw_filled_rect(const Rect& rect, const Color& color,
+DrawingContext::draw_filled_rect(const Rectf& rect, const Color& color,
                                  int layer)
 {
   draw_filled_rect(rect, color, 0.0f, layer);
 }
 
 void
-DrawingContext::draw_filled_rect(const Rect& rect, const Color& color, float radius, int layer)
+DrawingContext::draw_filled_rect(const Rectf& rect, const Color& color, float radius, int layer)
 {
   DrawingRequest* request = new(obst) DrawingRequest();