From: Ryan Flegel Date: Wed, 26 Apr 2006 05:59:31 +0000 (+0000) Subject: Cause MrBomb to be instantly killed by invincibility or bullets X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=8e38c01a8c4f2937c3f53d46d3034b0f55ba4316;p=supertux.git Cause MrBomb to be instantly killed by invincibility or bullets SVN-Revision: 3436 --- diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp index 67722369b..ef95a459d 100644 --- a/src/badguy/mrbomb.cpp +++ b/src/badguy/mrbomb.cpp @@ -110,13 +110,4 @@ 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 92af127c1..018e1e037 100644 --- a/src/badguy/mrbomb.hpp +++ b/src/badguy/mrbomb.hpp @@ -33,7 +33,6 @@ 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);