X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.hpp;h=845c063a3d45bd01b1f18c79786d73e662f1710d;hb=4a486d92343d1824b311c234e9321e08f280fe68;hp=4759f8be44bc94777f32018cad074cbdb69c6fb1;hpb=12966e3f986f7202125ae590c74a4d0c227441dd;p=supertux.git diff --git a/src/badguy/mrbomb.hpp b/src/badguy/mrbomb.hpp index 4759f8be4..845c063a3 100644 --- a/src/badguy/mrbomb.hpp +++ b/src/badguy/mrbomb.hpp @@ -20,29 +20,21 @@ #ifndef __MRBOMB_H__ #define __MRBOMB_H__ -#include "badguy.hpp" +#include "walking_badguy.hpp" -class MrBomb : public BadGuy +class MrBomb : public WalkingBadguy { public: MrBomb(const lisp::Lisp& reader); MrBomb(const Vector& pos, Direction d); - void activate(); - void active_update(float elapsed_time); void write(lisp::Writer& writer); - HitResponse collision_solid(GameObject& other, const CollisionHit& hit); - HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit); void kill_fall(); virtual MrBomb* clone() const { return new MrBomb(*this); } protected: bool collision_squished(Player& player); - bool set_direction; - Direction initial_direction; - std::string direction; }; #endif -