X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fgameobjs.h;h=69b0f260b1ea157714aeaba194d1d9a53a2c2d7c;hb=eb7c6ccdd326f6bceb67cd5259015dd994b04928;hp=d5c9583655b1ce19fa316ca8748ab2df0f1c2ff0;hpb=9599042661b468aae7bd34dca05441c0ebc93ad7;p=supertux.git

diff --git a/src/object/gameobjs.h b/src/object/gameobjs.h
index d5c958365..69b0f260b 100644
--- a/src/object/gameobjs.h
+++ b/src/object/gameobjs.h
@@ -23,18 +23,16 @@
 
 #include "video/surface.h"
 #include "timer.h"
-#include "math/physic.h"
-#include "special/game_object.h"
-#include "special/moving_object.h"
+#include "physic.h"
+#include "game_object.h"
+#include "moving_object.h"
 #include "serializable.h"
 
 /* Bounciness of distros: */
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
-namespace SuperTux {
 class Sprite;
-}
 
 class BouncyCoin : public GameObject
 {
@@ -47,7 +45,7 @@ public:
 private:
   Sprite* sprite;
   Vector position;
-  Timer2 timer;
+  Timer timer;
 };
 
 class BrokenBrick : public GameObject
@@ -60,7 +58,7 @@ public:
   virtual void draw(DrawingContext& context);
 
 private:
-  Timer2 timer;
+  Timer timer;
   Sprite* sprite;
   Vector position;
   Vector movement;
@@ -78,7 +76,7 @@ public:
 private:
   Vector position;
   std::string text;
-  Timer2 timer;  
+  Timer timer;  
 };
 
 extern Sprite *img_smoke_cloud;
@@ -92,7 +90,7 @@ public:
   virtual void draw(DrawingContext& context);
 
 private:
-  Timer2 timer;
+  Timer timer;
   Vector position;
 };
 
@@ -109,7 +107,7 @@ public:
 
 private:
   Vector accel;
-  Timer2 timer;
+  Timer timer;
   bool live_forever;
 
   Color color;