From: terencehill <piuntn@gmail.com>
Date: Fri, 11 Oct 2024 10:49:27 +0000 (+0200)
Subject: Show a translatable message when player is killed by trigger_hurt even if they weren... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e9d1212155ecad7f82a9d47b44035756ee61596e;p=xonotic%2Fxonotic-data.pk3dir.git

Show a translatable message when player is killed by trigger_hurt even if they weren't pushed by another player
---

diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc
index 8527bdf29..30994ba9e 100644
--- a/qcsrc/common/notifications/all.inc
+++ b/qcsrc/common/notifications/all.inc
@@ -357,7 +357,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 s3loc spree_lost", "s1",   "notify_void",            "^BG%s^K1 %s^K1%s%s", "")
+    MSG_INFO_NOTIF(DEATH_SELF_VOID,                         N_CONSOLE,  2, 1, "s1 s2loc spree_lost", "s1",      "notify_void",          _("^BG%s^K1 ended up in the wrong place%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 928f073e1..826e84d2b 100644
--- a/qcsrc/server/damage.qc
+++ b/qcsrc/server/damage.qc
@@ -284,7 +284,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype, .en
 						break;
 					}
 					case DEATH_HURTTRIGGER:
-						Obituary_SpecialDeath(targ, false, deathtype, targ.netname, inflictor.message, deathlocation, CS(targ).killcount, 0, 0);
+						Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", CS(targ).killcount, 0, 0);
 						break;
 					default:
 					{
@@ -436,8 +436,8 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype, .en
 			{
 				Obituary_SpecialDeath(targ, false, deathtype,
 					targ.netname,
-					inflictor.message,
 					deathlocation,
+					"",
 					CS(targ).killcount,
 					0,
 					0);