From: Ingo Ruhnke <grumbel@gmx.de>
Date: Thu, 22 Apr 2004 16:52:02 +0000 (+0000)
Subject: - undo of my last patch, removing 'this' is not a good idea and causes even worse... 
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;ds=sidebyside;h=3c4b67c632722c9a3af821a20823fd9c65636ca4;p=supertux.git

- undo of my last patch, removing 'this' is not a good idea and causes even worse side effects

SVN-Revision: 643
---

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 1c06b259e..870ee4291 100644
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -856,7 +856,6 @@ void
 BadGuy::squish(Player* player)
 {
   if(kind == BAD_MRBOMB) {
-    remove_me();
     // mrbomb transforms into a bomb now
     World::current()->add_bad_guy(base.x, base.y, BAD_BOMB);
     
@@ -864,7 +863,7 @@ BadGuy::squish(Player* player)
     World::current()->add_score(base.x - scroll_x, base.y, 50 * player_status.score_multiplier);
     play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER);
     player_status.score_multiplier++;
-      
+    remove_me();     
     return;
 
   } else if(kind == BAD_BSOD) {