"You broke an office lamp..."

bradharding · Sep 6, 2024 · 3b6c91e · 3b6c91e
1 parent 00c089c
commit 3b6c91e
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/p_inter.c b/src/p_inter.c
@@ -1836,13 +1836,15 @@ static void P_WriteObituary(mobj_t *target, mobj_t *inflicter, mobj_t *source, c
 
                     if (readyweapon == wp_fist && viewplayer->powers[pw_strength])
                         C_PlayerMessage("You %s %s with your %s while %s.",
-                            (target->type == MT_BARREL ? "exploded" : (gibbed ? s_GIBBED : s_KILLED)),
+                            (target->type == MT_BARREL ? "exploded" :
+                                (target->type == MT_EXTRA50 && ID1 ? "broke" : (gibbed ? s_GIBBED : s_KILLED))),
                             targetname,
                             weaponinfo[readyweapon].name,
                             berserk);
                     else
                         C_PlayerMessage("You %s %s with your %s.",
-                            (target->type == MT_BARREL ? "exploded" : (gibbed ? s_GIBBED : s_KILLED)),
+                            (target->type == MT_BARREL ? "exploded" :
+                                (target->type == MT_EXTRA50 && ID1 ? "broke" : (gibbed ? s_GIBBED : s_KILLED))),
                             targetname,
                             weaponinfo[readyweapon].name);
                 }
@@ -1883,15 +1885,17 @@ static void P_WriteObituary(mobj_t *target, mobj_t *inflicter, mobj_t *source, c
                     if (readyweapon == wp_fist && viewplayer->powers[pw_strength])
                         C_PlayerMessage("%s %s %s with %s %s while %s.",
                             playername,
-                            (target->type == MT_BARREL ? "exploded" : (gibbed ? s_GIBBED : s_KILLED)),
+                            (target->type == MT_BARREL ? "exploded" :
+                                (target->type == MT_EXTRA50 && ID1 ? "broke" : (gibbed ? s_GIBBED : s_KILLED))),
                             targetname,
                             pronoun(possessive),
                             weaponinfo[readyweapon].name,
                             berserk);
                     else
                         C_PlayerMessage("%s %s %s with %s %s.",
                             playername,
-                            (target->type == MT_BARREL ? "exploded" : (gibbed ? s_GIBBED : s_KILLED)),
+                            (target->type == MT_BARREL ? "exploded" :
+                                (target->type == MT_EXTRA50 && ID1 ? "broke" : (gibbed ? s_GIBBED : s_KILLED))),
                             targetname,
                             pronoun(possessive),
                             weaponinfo[readyweapon].name);
@@ -1945,7 +1949,8 @@ static void P_WriteObituary(mobj_t *target, mobj_t *inflicter, mobj_t *source, c
 
                 C_PlayerMessage("%s %s %s.",
                     temp,
-                    (target->type == MT_BARREL ? "exploded" : (gibbed ? s_GIBBED : s_KILLED)),
+                    (target->type == MT_BARREL ? "exploded" :
+                        (target->type == MT_EXTRA50 && ID1 ? "broke" : (gibbed ? s_GIBBED : s_KILLED))),
                     targetname);
 
                 free(temp);