X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fstalactite.hpp;h=bf9484bfd9070853687d6b3af83dcb9ada854c09;hb=198f758764fff064a47630b5d0f1e3d6aabe95a8;hp=9619f612785fb6ef8d70085bdf7db4d5f7dc168e;hpb=58eb3364f724b2100859fd39da9bba5a9a09cafc;p=supertux.git diff --git a/src/badguy/stalactite.hpp b/src/badguy/stalactite.hpp index 9619f6127..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); - 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); @@ -38,6 +39,8 @@ public: virtual Stalactite* clone() const { return new Stalactite(*this); } + void squish(); + protected: Timer timer; @@ -51,4 +54,3 @@ protected: }; #endif -