Check if this fixes the jamming.

[supertux.git] / src / gameobjs.h

diff --git a/src/gameobjs.h b/src/gameobjs.h
index d9459f4..9112cae 100644 (file)
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -22,21 +22,27 @@
 #ifndef SUPERTUX_GAMEOBJS_H
 #define SUPERTUX_GAMEOBJS_H
 
-#include "type.h"
-#include "screen/texture.h"
-#include "timer.h"
+#include "special/base.h"
+#include "video/surface.h"
+#include "special/timer.h"
 #include "scene.h"
-#include "physic.h"
+#include "math/physic.h"
 #include "collision.h"
-#include "game_object.h"
-#include "moving_object.h"
+#include "special/game_object.h"
+#include "special/moving_object.h"
 #include "serializable.h"
-#include "lispwriter.h"
+#include "utils/lispwriter.h"
 
 /* Bounciness of distros: */
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
+namespace SuperTux {
+class Sprite;
+}
+
+struct TileId;
+
 class BouncyDistro : public GameObject
 {
 public:
@@ -82,7 +88,7 @@ private:
   Vector position;
   float offset;   
   float offset_m;
-  int shape;      
+  TileId& shape;      
 };
 
 class FloatingScore : public GameObject
@@ -99,10 +105,14 @@ private:
   Timer timer;  
 };
 
+#define TRAMPOLINE_FRAMES 4
+extern Sprite *img_trampoline[TRAMPOLINE_FRAMES];
+
 class Trampoline : public MovingObject, public Serializable
 {
 public:
   Trampoline(LispReader& reader);
+  Trampoline(float x, float y);
  
   virtual void write(LispWriter& writer);
   virtual void action(float frame_ratio);
@@ -119,10 +129,13 @@ public:
   unsigned int frame;
 };
 
+extern Sprite *img_flying_platform;
+
 class FlyingPlatform : public MovingObject, public Serializable
 {
 public:
   FlyingPlatform(LispReader& reader);
+  FlyingPlatform(int x, int y);
  
   virtual void write(LispWriter& writer);
   virtual void action(float frame_ratio);
@@ -149,6 +162,21 @@ public:
   unsigned int frame;
 };
 
+extern Sprite *img_smoke_cloud;
+
+class SmokeCloud : public GameObject
+{
+public:
+  SmokeCloud(const Vector& pos);
+  
+  virtual void action(float elapsed_time);
+  virtual void draw(DrawingContext& context);
+
+private:
+  Timer timer;
+  Vector position;
+};
+
 void load_object_gfx();
 
 #endif