--- a/src/Player.hh	Wed Jan 21 01:57:24 2009 +0200
+++ b/src/Player.hh	Wed Jan 21 03:33:35 2009 +0200
@@ -11,8 +11,9 @@
 #include "PhysicsObject.hh"
 #include "Input.hh"
 #include "Rope.hh"
-#include "GraphicsPointer.hh"
 #include "Types.hh"
+#include "Graphics/Drawable.hh"
+
 #include <vector>
 
 /**
@@ -155,7 +156,11 @@
      */
     static bool skin_loaded;
     static CL_Surface skin_surface;
-    virtual void draw (Graphics *g, PixelCoordinate camera);
+
+    /**
+     * Draw this player
+     */
+    virtual void draw (Display *display, PixelCoordinate camera);
 
     uint16_t getKills() { return kills; }
     uint16_t getDeaths() { return deaths; }
@@ -190,7 +195,7 @@
     /**
      * As Player, but also draws the current weapon name if displayWeapon
      */
-    virtual void draw (Graphics *g, bool displayWeapon, PixelCoordinate camera);
+    virtual void draw (Display *display, bool displayWeapon, PixelCoordinate camera);
 };
 
 /**