-made flapping less powerful by reducing speed and height

[supertux.git] / src / gameobjs.h

diff --git a/src/gameobjs.h b/src/gameobjs.h
index d5e779c..197273f 100644 (file)
--- a/src/gameobjs.h
+++ b/src/gameobjs.h
@@ -91,17 +91,18 @@ 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;  
 };
 
@@ -179,7 +180,7 @@ private:
 class Particles : public GameObject
 {
 public:
-  Particles(const Vector& epicenter, int number, Color color, int size, float velocity, int life_time);
+  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);
@@ -188,8 +189,9 @@ public:
 private:
   Color color;
   float size;
-  float velocity;
+  Vector vel, accel;
   Timer timer;
+  bool live_forever;
 
   struct Particle {
     Vector pos;