From: terencehill <piuntn@gmail.com>
Date: Fri, 23 Apr 2021 13:09:15 +0000 (+0200)
Subject: Fix 2 more incorrect notifications when notification_show_location is enabled:
X-Git-Tag: xonotic-v0.8.5~433
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8792a57f18c87e60538e83ffc52ef2cd973e36ab;p=xonotic%2Fxonotic-data.pk3dir.git

Fix 2 more incorrect notifications when notification_show_location is enabled:

* suicide due to falling into the void showed: "player was in the wrong place (near was in the wrong place)"
* suicide due to a barrel explosion showed: "player Mega Armor (near Mega Armor)" (this one was broken even with notification_show_location disabled)
---

diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc
index 715392c9e..986571499 100644
--- a/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@ -347,7 +347,7 @@ string multiteam_info_sprintf(string input, string teamname) { return ((input !=
     MSG_INFO_NOTIF(DEATH_SELF_VH_SPID_ROCKET,               N_CONSOLE,  2, 1, "s1 s2loc spree_lost", "s1",      "notify_death",         _("^BG%s^K1 was blasted to bits by a Spiderbot rocket%s%s"), "")
     MSG_INFO_NOTIF(DEATH_SELF_VH_WAKI_DEATH,                N_CONSOLE,  2, 1, "s1 s2loc spree_lost", "s1",      "notify_death",         _("^BG%s^K1 got caught in the blast of a Racer explosion%s%s"), "")
     MSG_INFO_NOTIF(DEATH_SELF_VH_WAKI_ROCKET,               N_CONSOLE,  2, 1, "s1 s2loc spree_lost", "s1",      "notify_death",         _("^BG%s^K1 couldn't find shelter from a Racer rocket%s%s"), "")
-    MSG_INFO_NOTIF(DEATH_SELF_VOID,                         N_CONSOLE,  3, 1, "s1 s2 s2loc spree_lost", "s1",   "notify_void",            "^BG%s^K1 %s^K1%s%s", "")
+    MSG_INFO_NOTIF(DEATH_SELF_VOID,                         N_CONSOLE,  3, 1, "s1 s2 s3loc spree_lost", "s1",   "notify_void",            "^BG%s^K1 %s^K1%s%s", "")
 
     MULTITEAM_INFO(DEATH_TEAMKILL,                          N_CONSOLE,  3, 1, "s1 s2 s3loc spree_end", "s2 s1",     "notify_teamkill_%s",   _("^BG%s^K1 was betrayed by ^BG%s^K1%s%s"), "", NAME)
 
diff --git a/qcsrc/server/damage.qc b/qcsrc/server/damage.qc
index ff234ab90..7e052de04 100644
--- a/qcsrc/server/damage.qc
+++ b/qcsrc/server/damage.qc
@@ -283,7 +283,9 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype, .en
 						Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", CS(targ).killcount, 0, 0);
 						break;
 					}
-
+					case DEATH_HURTTRIGGER:
+						Obituary_SpecialDeath(targ, false, deathtype, targ.netname, inflictor.message, deathlocation, CS(targ).killcount, 0, 0);
+						break;
 					default:
 					{
 						Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", CS(targ).killcount, 0, 0);