Skip to content

Commit 2d6dea1

Browse files
committed
Fix obituary when player explodes barrel and playername CVAR empty
1 parent aa94898 commit 2d6dea1

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

src/p_inter.c

+15-6
Original file line numberDiff line numberDiff line change
@@ -1776,12 +1776,21 @@ static void P_WriteObituary(mobj_t *target, mobj_t *inflicter, mobj_t *source, c
17761776
temp = sentencecase(targetname);
17771777

17781778
if (inflicter->inflicter == MT_PLAYER)
1779-
C_PlayerMessage("%s was %s by %s %s %s exploded.",
1780-
temp,
1781-
(gibbed ? s_GIBBED : s_KILLED),
1782-
(inflictername && isvowel(inflictername[0]) ? "an" : "a"),
1783-
(inflictername ? inflictername : "barrel"),
1784-
playername);
1779+
{
1780+
if (M_StringCompare(playername, playername_default))
1781+
C_PlayerMessage("%s was %s by %s %s you exploded.",
1782+
temp,
1783+
(gibbed ? s_GIBBED : s_KILLED),
1784+
(inflictername && isvowel(inflictername[0]) ? "an" : "a"),
1785+
(inflictername ? inflictername : "barrel"));
1786+
else
1787+
C_PlayerMessage("%s was %s by %s %s %s exploded.",
1788+
temp,
1789+
(gibbed ? s_GIBBED : s_KILLED),
1790+
(inflictername &&isvowel(inflictername[0]) ? "an" : "a"),
1791+
(inflictername ? inflictername : "barrel"),
1792+
playername);
1793+
}
17851794
else if (source == target)
17861795
C_PlayerMessage("%s was %s by %s %s they exploded.",
17871796
temp,

0 commit comments

Comments
 (0)