Disable acceleration in kill_fall().

[supertux.git] / src / object / gameobjs.hpp

diff --git a/src/object/gameobjs.hpp b/src/object/gameobjs.hpp
index 2fa10da..b3d50d7 100644 (file)
--- a/src/object/gameobjs.hpp
+++ b/src/object/gameobjs.hpp
@@ -22,7 +22,6 @@
 
 #include "video/surface.hpp"
 #include "timer.hpp"
-#include "physic.hpp"
 #include "game_object.hpp"
 #include "moving_object.hpp"
 #include "serializable.hpp"
@@ -37,7 +36,7 @@ class Sprite;
 class BouncyCoin : public GameObject
 {
 public:
-  BouncyCoin(const Vector& pos);
+  BouncyCoin(const Vector& pos, bool emerge=false);
   ~BouncyCoin();
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
@@ -46,6 +45,7 @@ private:
   Sprite* sprite;
   Vector position;
   Timer timer;
+  float emerge_distance;
 };
 
 class BrokenBrick : public GameObject
@@ -69,14 +69,14 @@ class FloatingText : public GameObject
 public:
   FloatingText(const Vector& pos, const std::string& text_);
   FloatingText(const Vector& pos, int s);  // use this for score, for instance
-  
+
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
 
 private:
   Vector position;
   std::string text;
-  Timer timer;  
+  Timer timer;
 };
 
 class SmokeCloud : public GameObject
@@ -84,7 +84,7 @@ class SmokeCloud : public GameObject
 public:
   SmokeCloud(const Vector& pos);
   ~SmokeCloud();
-  
+
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
 
@@ -94,7 +94,7 @@ private:
   Vector position;
 };
 
-#endif 
+#endif
 
 /* Local Variables: */
 /* mode:c++ */