Reverted bigger parts of tuxdev patch:

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

diff --git a/src/badguy/stalactite.hpp b/src/badguy/stalactite.hpp
index bd58d1b..ef48ede 100644 (file)
--- a/src/badguy/stalactite.hpp
+++ b/src/badguy/stalactite.hpp
@@ -26,16 +26,18 @@ class Stalactite : public BadGuy
 {
 public:
   Stalactite(const lisp::Lisp& reader);
- 
+
   void active_update(float elapsed_time);
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
-  HitResponse collision_player(Player& player, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
+  HitResponse collision_player(Player& player);
 
   void kill_fall();
   void draw(DrawingContext& context);
   void deactivate();
 
+  virtual Stalactite* clone() const { return new Stalactite(*this); }
+
 protected:
   Timer timer;
 
@@ -49,4 +51,3 @@ protected:
 };
 
 #endif
-