X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer.cpp;h=d285849496920e91686507b292779e796627dbf3;hb=cf4a9fe888b3faa0fcfd45870af756a5955d9030;hp=8734457992f8fff516a5d66dc417de2e85890264;hpb=472fe3c759427295b877bf7d32f176f7a72be90e;p=supertux.git

diff --git a/src/player.cpp b/src/player.cpp
index 873445799..d28584949 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -673,14 +673,12 @@ Player::collision(void* p_c_object, int c_object)
                   kill(SHRINK);
                 }
               else
-                {
-                   pbad_c->dying = DYING_FALLING;
-                   play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
-                   World::current()->add_score(pbad_c->base.x,
-                                               pbad_c->base.y,
-                                               25 * player_status.score_multiplier);
-                }
+                pbad_c->kill_me(20);
             }
+          else if (pbad_c->frozen_timer.check() && (pbad_c->kind == BAD_MRBOMB
+              || pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FISH
+              || pbad_c->kind == BAD_SPIKY))
+                pbad_c->kill_me(20);
           else
             {
               if (!invincible_timer.started())