X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvideo%2Fdrawing_context.cpp;h=e831fe06327308aee516b726dafb64931dffc6b6;hb=fbbf4e7e6f3f9251826f0c68169d3f04bb67efa8;hp=070cffbb0d4ae35e39cf132d06689c9bbc842e83;hpb=f0eca3366385d513651f695942c0ee8474a7de3b;p=supertux.git

diff --git a/src/video/drawing_context.cpp b/src/video/drawing_context.cpp
index 070cffbb0..e831fe063 100644
--- 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();