From 93fce85ce9814ed9f4ebf8f4b781dca177a61c15 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 30 Aug 2015 21:19:03 +1000 Subject: [PATCH] Bring back custom void death messages (proper fix seems unlikely, given the need to stay compatible with so many maps) --- qcsrc/common/notifications.inc | 2 +- qcsrc/server/g_damage.qc | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/qcsrc/common/notifications.inc b/qcsrc/common/notifications.inc index 1f553c796..715ea03d8 100644 --- a/qcsrc/common/notifications.inc +++ b/qcsrc/common/notifications.inc @@ -327,7 +327,7 @@ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VH_SPID_ROCKET, 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(1, INFO_DEATH_SELF_VH_WAKI_DEATH, 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(1, INFO_DEATH_SELF_VH_WAKI_ROCKET, 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(1, INFO_DEATH_SELF_VOID, 2, 1, "s1 s2loc spree_lost", "s1", "notify_void", _("^BG%s^K1 was in the wrong place%s%s"), "") + MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VOID, 3, 1, "s1 s2 s2loc spree_lost", "s1", "notify_void", "^BG%s^K1 %s^K1%s%s", "") MULTITEAM_INFO(1, INFO_DEATH_TEAMKILL_, 4, 3, 1, "s1 s2 s3loc spree_end", "s2 s1", "notify_teamkill_%s", _("^BG%s^K1 was betrayed by ^BG%s^K1%s%s"), "") MSG_INFO_NOTIF(1, INFO_DOMINATION_CAPTURE_TIME, 2, 2, "s1 s2 f1 f2", "", "", _("^BG%s^BG%s^BG (%s points every %s seconds)"), "") MSG_INFO_NOTIF(1, INFO_FREEZETAG_FREEZE, 2, 0, "s1 s2", "", "", _("^BG%s^K1 was frozen by ^BG%s"), "") diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 39ad85c6d..2ef47bec1 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -498,13 +498,17 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) // For now, we're just forcing HURTTRIGGER to behave as "DEATH_VOID" and giving it no special options... // Later on you will only be able to make custom messages using DEATH_CUSTOM, // and there will be a REAL DEATH_VOID implementation which mappers will use. - /*case DEATH_HURTTRIGGER: + case DEATH_HURTTRIGGER: { - s1 = targ.netname; - s2 = inflictor.message; - if(strstrofs(s2, "%", 0) < 0) { s2 = strcat("%s ", s2); } + Obituary_SpecialDeath(targ, false, deathtype, + targ.netname, + inflictor.message, + deathlocation, + targ.killcount, + 0, + 0); break; - }*/ + } case DEATH_CUSTOM: { -- 2.39.2