X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fshort_fuse.hpp;h=f14cca70950c03d122b89c58b1a3143c8edf40a6;hb=d794aac09d4a3b3f5f93985cd74381bb4de4ce84;hp=e6d497b1597fbf82334e994996178d6ba60cb2ae;hpb=71ea91f6bf80d100535a0b79f004785d1d8db8b2;p=supertux.git diff --git a/src/badguy/short_fuse.hpp b/src/badguy/short_fuse.hpp index e6d497b15..f14cca709 100644 --- a/src/badguy/short_fuse.hpp +++ b/src/badguy/short_fuse.hpp @@ -24,11 +24,12 @@ class ShortFuse : public WalkingBadguy { public: ShortFuse(const Reader& reader); - ShortFuse(const Vector& pos, Direction d); protected: HitResponse collision_player (Player& player, const CollisionHit& hit); + HitResponse collision_bullet (Bullet& bullet, const CollisionHit& ); bool collision_squished (GameObject& object); + void kill_fall (void); void explode (void); };