converted player to new object system

[supertux.git] / src / gameobjs.h

diff --git a/src/gameobjs.h b/src/gameobjs.h
index 162a3be..e303bbc 100644 (file)
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -26,19 +26,46 @@
 #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 };
+
+template <class T>
+struct ObjectData
+{
+  int x;
+  int y;
+  ObjectType type;
+  T type_specific;
+
+  ObjectData(ObjectData* pobject)
+    : x((int)pobject->x), y((int)pobject->y), type(pobject->type), type_specific(pobject->type_specific) {};
+  ObjectData(int x_, int y_, ObjectType type_, T type_specific_) 
+    : x(x_), y(y_), type(type_), type_specific(type_specific_) {};
+
+  ObjectData()
+    : x(0), y(0), type(OBJ_NONE), type_specific() {};
+};
 
 /* Bounciness of distros: */
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
-class BouncyDistro
+class BouncyDistro : public _GameObject, public Drawable
 {
- public:
-  base_type base;
-  
-  void init(float x, float y);
-  void action(double frame_ratio);
-  void draw(); 
+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];
@@ -48,43 +75,92 @@ extern Surface* img_distro[4];
 
 class Tile;
 
-class BrokenBrick
+class BrokenBrick : public _GameObject, public Drawable
 {
- public:
-  base_type base;
+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();
+  Vector position;
+  Vector movement;
 };
 
-class BouncyBrick
+class BouncyBrick : public _GameObject, public Drawable
 {
- public:
-  float offset;
+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"; };
+
+private:
+  Vector position;
+  float offset;   
   float offset_m;
-  int shape;
-  base_type base;
+  int shape;      
+};
 
-  void init(float x, float y);
-  void action(double frame_ratio);
-  void draw();
+class FloatingScore : public _GameObject, public Drawable
+{
+public:
+  FloatingScore(DisplayManager& displaymanager, const Vector& pos, int s);
+  
+  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 FloatingScore
+class Trampoline : public GameObject
 {
  public:
-  int value;
-  Timer timer;
-  base_type base;
-  
-  void init(float x, float y, int s);
+  void init(float x, float y);
   void action(double frame_ratio);
   void draw();
+  std::string type() { return "Trampoline"; };
+
+  Trampoline(ObjectData<TrampolineData> data)
+  {
+    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:
+  float power;
+  unsigned int frame;
 };
 
+void load_object_gfx();
+
 #endif 
 
 /* Local Variables: */