X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.hpp;h=63c43649342e5b8c17d41952dec8bfb07843bb66;hb=d84d73b701cc7fa2bd74f3490b9be1bf8b6f705a;hp=b5a88748142b116850201cd330b7810db3a18e6f;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/badguy/mrbomb.hpp b/src/badguy/mrbomb.hpp index b5a887481..63c436493 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, bool stay_on_plat); + 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; - bool stay_on_platform; - Direction initial_direction; }; #endif