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

SVN-Revision: 643

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 1c06b25..870ee42 100644 (file)
--- 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) {