X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fstalactite.hpp;h=bf9484bfd9070853687d6b3af83dcb9ada854c09;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=74803c28431e1d0e6f73fa7bc763b360bdcc2ef7;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git diff --git a/src/badguy/stalactite.hpp b/src/badguy/stalactite.hpp index 74803c284..bf9484bfd 100644 --- a/src/badguy/stalactite.hpp +++ b/src/badguy/stalactite.hpp @@ -26,11 +26,12 @@ class Stalactite : public BadGuy { public: Stalactite(const lisp::Lisp& reader); - + void active_update(float elapsed_time); void write(lisp::Writer& writer); 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); @@ -38,6 +39,8 @@ public: virtual Stalactite* clone() const { return new Stalactite(*this); } + void squish(); + protected: Timer timer; @@ -51,4 +54,3 @@ protected: }; #endif -