some fixes for the text object

[supertux.git] / src / object / gameobjs.h

diff --git a/src/object/gameobjs.h b/src/object/gameobjs.h
index 6b884d7..69b0f26 100644 (file)
--- a/src/object/gameobjs.h
+++ b/src/object/gameobjs.h
@@ -23,19 +23,16 @@
 
 #include "video/surface.h"
 #include "timer.h"
-#include "scene.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
 {
@@ -48,7 +45,7 @@ public:
 private:
   Sprite* sprite;
   Vector position;
-  Timer2 timer;
+  Timer timer;
 };
 
 class BrokenBrick : public GameObject
@@ -61,7 +58,7 @@ public:
   virtual void draw(DrawingContext& context);
 
 private:
-  Timer2 timer;
+  Timer timer;
   Sprite* sprite;
   Vector position;
   Vector movement;
@@ -79,7 +76,7 @@ public:
 private:
   Vector position;
   std::string text;
-  Timer2 timer;  
+  Timer timer;  
 };
 
 extern Sprite *img_smoke_cloud;
@@ -93,7 +90,7 @@ public:
   virtual void draw(DrawingContext& context);
 
 private:
-  Timer2 timer;
+  Timer timer;
   Vector position;
 };
 
@@ -110,7 +107,7 @@ public:
 
 private:
   Vector accel;
-  Timer2 timer;
+  Timer timer;
   bool live_forever;
 
   Color color;