X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameobjs.h;h=197273f0aac01cfc0584111fe3fa2b0406a79f5e;hb=42503cac8eac1199cccec2d4fbed7fde41a2bb55;hp=9112cae0c55b151d05cb3e98a8a319bd2aff7cc2;hpb=c1f63ef63bb685e2379e280684049bf9bc733dd4;p=supertux.git

diff --git a/src/gameobjs.h b/src/gameobjs.h
index 9112cae0c..197273f0a 100644
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -91,22 +91,22 @@ private:
   TileId& shape;      
 };
 
-class FloatingScore : public GameObject
+class FloatingText : public GameObject
 {
 public:
-  FloatingScore(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(DrawingContext& context);
 
 private:
   Vector position;
-  char str[10];
+  std::string text;
   Timer timer;  
 };
 
-#define TRAMPOLINE_FRAMES 4
-extern Sprite *img_trampoline[TRAMPOLINE_FRAMES];
+extern Sprite *img_trampoline;
 
 class Trampoline : public MovingObject, public Serializable
 {
@@ -177,6 +177,29 @@ private:
   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