X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.hpp;h=845c063a3d45bd01b1f18c79786d73e662f1710d;hb=4a486d92343d1824b311c234e9321e08f280fe68;hp=92af127c100c2f1076fcc7d66ef9f51894e28608;hpb=e6251bd4380831990a30f9a30d7ffa249bbda70e;p=supertux.git diff --git a/src/badguy/mrbomb.hpp b/src/badguy/mrbomb.hpp index 92af127c1..845c063a3 100644 --- a/src/badguy/mrbomb.hpp +++ b/src/badguy/mrbomb.hpp @@ -20,26 +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(float pos_x, float pos_y, Direction d); + 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; }; #endif -