X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameobjs.h;h=5ebbe07dfda7a12c81355e9158703dfbe70e3ff3;hb=8e13f4a4c6f373f40549f90cd2212815fd0d6eb7;hp=92d311db3734b876462ad7e4abb4815073c04b9b;hpb=edfad8a1de4efa71a86f7e643a0bcc2a709a8052;p=supertux.git

diff --git a/src/gameobjs.h b/src/gameobjs.h
index 92d311db3..5ebbe07df 100644
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -22,69 +22,139 @@
 #ifndef SUPERTUX_GAMEOBJS_H
 #define SUPERTUX_GAMEOBJS_H
 
-#include "type.h"
-#include "texture.h"
+#include "video/surface.h"
 #include "timer.h"
 #include "scene.h"
+#include "math/physic.h"
+#include "collision.h"
+#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
+namespace SuperTux {
+class Sprite;
+}
+
+class BouncyCoin : public GameObject
 {
- public:
-  
-  void init(float x, float y);
-  void action(double frame_ratio);
-  void draw(); 
-  std::string type() { return "BouncyDistro"; };
+public:
+  BouncyCoin(const Vector& pos);
+  ~BouncyCoin();
+  virtual void action(float elapsed_time);
+  virtual void draw(DrawingContext& context);
+
+private:
+  Sprite* sprite;
+  Vector position;
+  Timer2 timer;
 };
 
-extern Surface* img_distro[4];
+class BrokenBrick : public GameObject
+{
+public:
+  BrokenBrick(Sprite* sprite, const Vector& pos, const Vector& movement);
+  ~BrokenBrick();
 
-#define BOUNCY_BRICK_MAX_OFFSET 8
-#define BOUNCY_BRICK_SPEED 0.9
+  virtual void action(float elapsed_time);
+  virtual void draw(DrawingContext& context);
 
-class Tile;
+private:
+  Timer2 timer;
+  Sprite* sprite;
+  Vector position;
+  Vector movement;
+};
 
-class BrokenBrick : public GameObject
+class FloatingText : public GameObject
 {
- public:
-  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"; };
+public:
+  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(DrawingContext& context);
+
+private:
+  Vector position;
+  std::string text;
+  Timer2 timer;  
 };
 
-class BouncyBrick : public GameObject
+#if 0
+extern Sprite *img_trampoline;
+
+class Trampoline : public MovingObject, public Serializable
 {
- public:
-  float offset;
-  float offset_m;
-  int shape;
-
-  void init(float x, float y);
-  void action(double frame_ratio);
-  void draw();
-  std::string type() { return "BouncyBrick"; };
+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);
+
+  Physic physic;
+  enum { M_NORMAL, M_HELD } mode;
+
+ private:
+  float power;
+  unsigned int frame;
 };
+#endif
+
+extern Sprite *img_smoke_cloud;
 
-class FloatingScore : public GameObject
+class SmokeCloud : public GameObject
 {
- public:
-  int value;
-  Timer timer;
+public:
+  SmokeCloud(const Vector& pos);
   
-  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(DrawingContext& context);
+
+private:
+  Timer2 timer;
+  Vector position;
 };
 
+class Particles : public GameObject
+{
+public:
+  Particles(const Vector& epicenter, int min_angle, int max_angle,
+            const Vector& initial_velocity, const Vector& acceleration,
+            int number, Color color, int size, float life_time, int drawing_layer);
+  ~Particles();
+  
+  virtual void action(float elapsed_time);
+  virtual void draw(DrawingContext& context);
+
+private:
+  Vector accel;
+  Timer2 timer;
+  bool live_forever;
+
+  Color color;
+  float size;
+  int drawing_layer;
+
+  struct Particle {
+    Vector pos, vel;
+//     float angle;
+    };
+  std::vector <Particle*> particles;
+};
+
+void load_object_gfx();
+void free_object_gfx();
+
 #endif 
 
 /* Local Variables: */