X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fstalactite.hpp;h=bf9484bfd9070853687d6b3af83dcb9ada854c09;hb=13c84268f16872f9b442251c4175a3a1a7a7899a;hp=bd58d1b7d150ee339cb29ce018329a1ccdb5d9a3;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/badguy/stalactite.hpp b/src/badguy/stalactite.hpp index bd58d1b7d..bf9484bfd 100644 --- a/src/badguy/stalactite.hpp +++ b/src/badguy/stalactite.hpp @@ -26,16 +26,21 @@ 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); + HitResponse collision_badguy(BadGuy& other, const CollisionHit& hit); void kill_fall(); void draw(DrawingContext& context); void deactivate(); + virtual Stalactite* clone() const { return new Stalactite(*this); } + + void squish(); + protected: Timer timer; @@ -49,4 +54,3 @@ protected: }; #endif -