converted player to new object system

[supertux.git] / src / gameobjs.h

diff --git a/src/gameobjs.h b/src/gameobjs.h
index 8037db6..e303bbc 100644 (file)
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -26,6 +26,10 @@
 #include "texture.h"
 #include "timer.h"
 #include "scene.h"
+#include "physic.h"
+#include "collision.h"
+#include "game_object.h"
+#include "drawable.h"
 
 enum ObjectType { OBJ_NONE, OBJ_BADGUY, OBJ_TRAMPOLINE };
 
@@ -46,24 +50,22 @@ struct ObjectData
     : x(0), y(0), type(OBJ_NONE), type_specific() {};
 };
 
-struct TrampolineData
-{
-  int power;
-};
-
-
 /* Bounciness of distros: */
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
-class BouncyDistro : public GameObject
+class BouncyDistro : public _GameObject, public Drawable
 {
- public:
-  
-  void init(float x, float y);
-  void action(double frame_ratio);
-  void draw(); 
-  std::string type() { return "BouncyDistro"; };
+public:
+  BouncyDistro(DisplayManager& displaymanager, const Vector& pos);
+  virtual void action(float elapsed_time);
+  virtual void draw(ViewPort& viewport, int layer);
+  virtual std::string type() const
+  { return "BouncyDistro"; };
+
+private:
+  Vector position;
+  float ym;
 };
 
 extern Surface* img_distro[4];
@@ -73,41 +75,63 @@ extern Surface* img_distro[4];
 
 class Tile;
 
-class BrokenBrick : public GameObject
+class BrokenBrick : public _GameObject, public Drawable
 {
- public:
+public:
+  BrokenBrick(DisplayManager& displaymanager, Tile* tile,
+      const Vector& pos, const Vector& movement);
+
+  virtual void action(float elapsed_time);
+  virtual void draw(ViewPort& viewport, int layer);
+
+  virtual std::string type() const
+  { return "BrokenBrick"; };
+
+private:
   Timer timer;
   Tile* tile;
-
-  void init(Tile* tile, float x, float y, float xm, float ym);
-  void action(double frame_ratio);
-  void draw();
-  std::string type() { return "BrokenBrick"; };
+  Vector position;
+  Vector movement;
 };
 
-class BouncyBrick : public GameObject
+class BouncyBrick : public _GameObject, public Drawable
 {
- public:
-  float offset;
-  float offset_m;
-  int shape;
+public:
+  BouncyBrick(DisplayManager& displaymanager, const Vector& pos);
+  virtual void action(float elapsed_time);
+  virtual void draw(ViewPort& viewport, int layer);
+  
+  virtual std::string type() const
+  { return "BouncyBrick"; };
 
-  void init(float x, float y);
-  void action(double frame_ratio);
-  void draw();
-  std::string type() { return "BouncyBrick"; };
+private:
+  Vector position;
+  float offset;   
+  float offset_m;
+  int shape;      
 };
 
-class FloatingScore : public GameObject
+class FloatingScore : public _GameObject, public Drawable
 {
- public:
-  int value;
-  Timer timer;
+public:
+  FloatingScore(DisplayManager& displaymanager, const Vector& pos, int s);
   
-  void init(float x, float y, int s);
-  void action(double frame_ratio);
-  void draw();
-  std::string type() { return "FloatingScore"; };
+  virtual void action(float elapsed_time);
+  virtual void draw(ViewPort& viewport, int layer);
+  virtual std::string type() const
+  { return "FloatingScore"; };
+
+private:
+  Vector position;
+  char str[10];
+  Timer timer;  
+};
+
+
+/* Trampoline */
+struct TrampolineData
+{
+  float power;
 };
 
 class Trampoline : public GameObject
@@ -120,17 +144,22 @@ class Trampoline : public GameObject
 
   Trampoline(ObjectData<TrampolineData> data)
   {
-    base.x = data.x;
-    base.y = data.y;
-
     power = data.type_specific.power;
-  }
+
+    init(data.x, data.y);
+  };
+
+  void collision(void *p_c_object, int c_object, CollisionType type);
+
+  Physic physic;
+  enum { M_NORMAL, M_HELD } mode;
 
  private:
-  int power;
+  float power;
+  unsigned int frame;
 };
 
-void load_trampoline_gfx();
+void load_object_gfx();
 
 #endif