X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameobjs.h;h=197273f0aac01cfc0584111fe3fa2b0406a79f5e;hb=e4db6eb50cd6bcba607858b5e6c4c5d53531ed1f;hp=e303bbc4a9bf930dfd6c24fe6a31cc040a66f38c;hpb=7e3d22eda4aef5950ab194d36e5500e79c42402e;p=supertux.git

diff --git a/src/gameobjs.h b/src/gameobjs.h
index e303bbc4a..197273f0a 100644
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -22,46 +22,33 @@
 #ifndef SUPERTUX_GAMEOBJS_H
 #define SUPERTUX_GAMEOBJS_H
 
-#include "type.h"
-#include "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 "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() {};
-};
+#include "special/game_object.h"
+#include "special/moving_object.h"
+#include "serializable.h"
+#include "utils/lispwriter.h"
 
 /* Bounciness of distros: */
 #define NO_BOUNCE 0
 #define BOUNCE 1
 
-class BouncyDistro : public _GameObject, public Drawable
+namespace SuperTux {
+class Sprite;
+}
+
+struct TileId;
+
+class BouncyDistro : public GameObject
 {
 public:
-  BouncyDistro(DisplayManager& displaymanager, const Vector& pos);
+  BouncyDistro(const Vector& pos);
   virtual void action(float elapsed_time);
-  virtual void draw(ViewPort& viewport, int layer);
-  virtual std::string type() const
-  { return "BouncyDistro"; };
+  virtual void draw(DrawingContext& context);
 
 private:
   Vector position;
@@ -75,17 +62,13 @@ extern Surface* img_distro[4];
 
 class Tile;
 
-class BrokenBrick : public _GameObject, public Drawable
+class BrokenBrick : public GameObject
 {
 public:
-  BrokenBrick(DisplayManager& displaymanager, Tile* tile,
-      const Vector& pos, const Vector& movement);
+  BrokenBrick(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"; };
+  virtual void draw(DrawingContext& context);
 
 private:
   Timer timer;
@@ -94,71 +77,129 @@ private:
   Vector movement;
 };
 
-class BouncyBrick : public _GameObject, public Drawable
+class BouncyBrick : public GameObject
 {
 public:
-  BouncyBrick(DisplayManager& displaymanager, const Vector& pos);
+  BouncyBrick(const Vector& pos);
   virtual void action(float elapsed_time);
-  virtual void draw(ViewPort& viewport, int layer);
+  virtual void draw(DrawingContext& context);
   
-  virtual std::string type() const
-  { return "BouncyBrick"; };
-
 private:
   Vector position;
   float offset;   
   float offset_m;
-  int shape;      
+  TileId& shape;      
 };
 
-class FloatingScore : public _GameObject, public Drawable
+class FloatingText : public GameObject
 {
 public:
-  FloatingScore(DisplayManager& displaymanager, const Vector& pos, int s);
+  FloatingText(const Vector& pos, const std::string& text_);
+  FloatingText(const Vector& pos, int s);  // use this for score, for instance
   
   virtual void action(float elapsed_time);
-  virtual void draw(ViewPort& viewport, int layer);
-  virtual std::string type() const
-  { return "FloatingScore"; };
+  virtual void draw(DrawingContext& context);
 
 private:
   Vector position;
-  char str[10];
+  std::string text;
   Timer timer;  
 };
 
+extern Sprite *img_trampoline;
 
-/* Trampoline */
-struct TrampolineData
+class Trampoline : public MovingObject, public Serializable
 {
-  float power;
-};
+public:
+  Trampoline(LispReader& reader);
+  Trampoline(float x, float y);
+ 
+  virtual void write(LispWriter& writer);
+  virtual void action(float frame_ratio);
+  virtual void draw(DrawingContext& context);
+
+  virtual void collision(const MovingObject& other, int);
+  void collision(void *p_c_object, int c_object, CollisionType type);
 
-class Trampoline : public GameObject
-{
- public:
-  void init(float x, float y);
-  void action(double frame_ratio);
-  void draw();
-  std::string type() { return "Trampoline"; };
+  Physic physic;
+  enum { M_NORMAL, M_HELD } mode;
 
-  Trampoline(ObjectData<TrampolineData> data)
-  {
-    power = data.type_specific.power;
+ private:
+  float power;
+  unsigned int frame;
+};
 
-    init(data.x, data.y);
-  };
+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);
+  virtual void draw(DrawingContext& context);
+
+  virtual void collision(const MovingObject& other, int);
   void collision(void *p_c_object, int c_object, CollisionType type);
 
+  float get_vel_x() { return vel_x; }
+  float get_vel_y() { return vel_y; }
+
   Physic physic;
   enum { M_NORMAL, M_HELD } mode;
 
  private:
-  float power;
+  std::vector<int> pos_x;
+  std::vector<int> pos_y;
+  float velocity;
+
+  float vel_x, vel_y;  // calculated based in the velocity
+
+  int point;
+  bool move;
   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;
+};
+
+class Particles : public GameObject
+{
+public:
+  Particles(const Vector& epicenter, const Vector& velocity, const Vector& acceleration, int number, Color color, int size, int life_time);
+  ~Particles();
+  
+  virtual void action(float elapsed_time);
+  virtual void draw(DrawingContext& context);
+
+private:
+  Color color;
+  float size;
+  Vector vel, accel;
+  Timer timer;
+  bool live_forever;
+
+  struct Particle {
+    Vector pos;
+    float angle;
+    };
+  std::vector <Particle*> particles;
+};
+
 void load_object_gfx();
 
 #endif