From: Ryan Flegel Date: Thu, 27 Apr 2006 21:17:32 +0000 (+0000) Subject: Reverted MrBomb kill behaviour X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e6251bd4380831990a30f9a30d7ffa249bbda70e;p=supertux.git Reverted MrBomb kill behaviour SVN-Revision: 3455 --- diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp index ef95a459d..67722369b 100644 --- a/src/badguy/mrbomb.cpp +++ b/src/badguy/mrbomb.cpp @@ -110,4 +110,13 @@ MrBomb::collision_badguy(BadGuy& , const CollisionHit& hit) return CONTINUE; } +void +MrBomb::kill_fall() +{ + remove_me(); + Bomb* bomb = new Bomb(get_pos(), dir); + Sector::current()->add_object(bomb); + bomb->explode(); +} + IMPLEMENT_FACTORY(MrBomb, "mrbomb") diff --git a/src/badguy/mrbomb.hpp b/src/badguy/mrbomb.hpp index 018e1e037..92af127c1 100644 --- a/src/badguy/mrbomb.hpp +++ b/src/badguy/mrbomb.hpp @@ -33,6 +33,7 @@ public: void write(lisp::Writer& writer); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit); + void kill_fall(); protected: bool collision_squished(Player& player);