Badguys that die will still trigger collisions during the current frame (closes issue 50)

[supertux.git] / src / badguy / bouncing_snowball.hpp

diff --git a/src/badguy/bouncing_snowball.hpp b/src/badguy/bouncing_snowball.hpp
index ba6c7b2..ed2c5cb 100644 (file)
--- a/src/badguy/bouncing_snowball.hpp
+++ b/src/badguy/bouncing_snowball.hpp
@@ -26,18 +26,17 @@ class BouncingSnowball : public BadGuy
 {
 public:
   BouncingSnowball(const lisp::Lisp& reader);
-  BouncingSnowball(float pos_x, float pos_y, Direction d);
+  BouncingSnowball(const Vector& pos, Direction d);
 
   void activate();
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
 
+  virtual BouncingSnowball* clone() const { return new BouncingSnowball(*this); }
+
 protected:
-  bool collision_squished(Player& player);
-  bool set_direction;
-  Direction initial_direction;  
+  bool collision_squished(GameObject& object);
 };
 
 #endif
-