[Super-tux-commit] supertux/src badguy.cpp,1.44,1.45

[Ingo R. <gr...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv753

Modified Files:
	badguy.cpp 
Log Message:
- undo of my last patch, removing 'this' is not a good idea and causes even worse side effects

Index: badguy.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- badguy.cpp	22 Apr 2004 16:49:28 -0000	1.44
+++ badguy.cpp	22 Apr 2004 16:52:02 -0000	1.45
@@ -856,7 +856,6 @@
 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 @@
     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) {