From effddd622847731ce697f7be9db7f6b574c1497d Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Thu, 13 Dec 2012 16:43:58 -0500 Subject: [PATCH] Bring notifications to be mostly functional again --- qcsrc/common/deathtypes.qh | 98 +++++++++++++++++------------------ qcsrc/common/notifications.qc | 75 ++++++++++++++------------- qcsrc/server/g_damage.qc | 17 +++--- 3 files changed, 95 insertions(+), 95 deletions(-) diff --git a/qcsrc/common/deathtypes.qh b/qcsrc/common/deathtypes.qh index 2df55317d..b7a5747c4 100644 --- a/qcsrc/common/deathtypes.qh +++ b/qcsrc/common/deathtypes.qh @@ -18,55 +18,55 @@ float DT_COUNT; ACCUMULATE_FUNCTION(RegisterDeathtypes, RegisterDeathtype_##name) #define DEATHTYPES \ - DEATHTYPE(DEATH_FALL, FALSE, DEATH_SELF_FALL, DEATH_SPECIAL_START) \ - DEATHTYPE(DEATH_TELEFRAG, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_DROWN, FALSE, DEATH_SELF_DROWN, NORMAL_POS) \ - DEATHTYPE(DEATH_HURTTRIGGER, FALSE, DEATH_SELF_CUSTOM, NORMAL_POS) \ - DEATHTYPE(DEATH_LAVA, FALSE, DEATH_SELF_LAVA, NORMAL_POS) \ - DEATHTYPE(DEATH_SLIME, FALSE, DEATH_SELF_SLIME, NORMAL_POS) \ - DEATHTYPE(DEATH_KILL, FALSE, DEATH_SELF_SUICIDE, NORMAL_POS) \ - DEATHTYPE(DEATH_NOAMMO, FALSE, DEATH_SELF_NOAMMO, NORMAL_POS) \ - DEATHTYPE(DEATH_SWAMP, FALSE, DEATH_SELF_SWAMP, NORMAL_POS) \ - DEATHTYPE(DEATH_TEAMCHANGE, FALSE, DEATH_SELF_TEAMCHANGE, NORMAL_POS) \ - DEATHTYPE(DEATH_AUTOTEAMCHANGE, FALSE, DEATH_SELF_AUTOTEAMCHANGE, NORMAL_POS) \ - DEATHTYPE(DEATH_CAMP, FALSE, DEATH_SELF_CAMP, NORMAL_POS) \ - DEATHTYPE(DEATH_SHOOTING_STAR, FALSE, DEATH_SELF_SHOOTING_STAR, NORMAL_POS) \ - DEATHTYPE(DEATH_ROT, FALSE, DEATH_SELF_ROT, NORMAL_POS) \ - DEATHTYPE(DEATH_MIRRORDAMAGE, FALSE, DEATH_SELF_BETRAYAL, NORMAL_POS) \ - DEATHTYPE(DEATH_TOUCHEXPLODE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_CHEAT, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_FIRE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_VHCRUSH, FALSE, FALSE, DEATH_VHFIRST) \ - DEATHTYPE(DEATH_SBMINIGUN, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_SBROCKET, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_SBBLOWUP, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_WAKIGUN, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_WAKIROCKET, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_WAKIBLOWUP, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_RAPTOR_CANNON, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_RAPTOR_BOMB, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_RAPTOR_BOMB_SPLIT, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_RAPTOR_DEATH, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_BUMB_GUN, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_BUMB_RAY, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_BUMB_RAY_HEAL, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_BUMB_DEATH, FALSE, FALSE, DEATH_VHLAST) \ - DEATHTYPE(DEATH_TURRET, FALSE, FALSE, DEATH_TURRET_FIRST) \ - DEATHTYPE(DEATH_TURRET_EWHEEL, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_FLAC, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_MACHINEGUN, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_WALKER_GUN, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_WALKER_MEELE, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_WALKER_ROCKET, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_HELLION, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_HK, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_MLRS, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_PLASMA, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_PHASER, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_TURRET_TESLA, FALSE, FALSE, DEATH_TURRET_LAST) \ - DEATHTYPE(DEATH_GENERIC, FALSE, DEATH_SELF_GENERIC, NORMAL_POS) \ - DEATHTYPE(DEATH_WEAPON, FALSE, FALSE, NORMAL_POS) \ - DEATHTYPE(DEATH_CUSTOM, FALSE, DEATH_SELF_CUSTOM, NORMAL_POS) + DEATHTYPE(DEATH_FALL, NO_MSG, DEATH_SELF_FALL, DEATH_SPECIAL_START) \ + DEATHTYPE(DEATH_TELEFRAG, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_DROWN, NO_MSG, DEATH_SELF_DROWN, NORMAL_POS) \ + DEATHTYPE(DEATH_HURTTRIGGER, NO_MSG, DEATH_SELF_CUSTOM, NORMAL_POS) \ + DEATHTYPE(DEATH_LAVA, NO_MSG, DEATH_SELF_LAVA, NORMAL_POS) \ + DEATHTYPE(DEATH_SLIME, NO_MSG, DEATH_SELF_SLIME, NORMAL_POS) \ + DEATHTYPE(DEATH_KILL, NO_MSG, DEATH_SELF_SUICIDE, NORMAL_POS) \ + DEATHTYPE(DEATH_NOAMMO, NO_MSG, DEATH_SELF_NOAMMO, NORMAL_POS) \ + DEATHTYPE(DEATH_SWAMP, NO_MSG, DEATH_SELF_SWAMP, NORMAL_POS) \ + DEATHTYPE(DEATH_TEAMCHANGE, NO_MSG, DEATH_SELF_TEAMCHANGE, NORMAL_POS) \ + DEATHTYPE(DEATH_AUTOTEAMCHANGE, NO_MSG, DEATH_SELF_AUTOTEAMCHANGE, NORMAL_POS) \ + DEATHTYPE(DEATH_CAMP, NO_MSG, DEATH_SELF_CAMP, NORMAL_POS) \ + DEATHTYPE(DEATH_SHOOTING_STAR, NO_MSG, DEATH_SELF_SHOOTING_STAR, NORMAL_POS) \ + DEATHTYPE(DEATH_ROT, NO_MSG, DEATH_SELF_ROT, NORMAL_POS) \ + DEATHTYPE(DEATH_MIRRORDAMAGE, NO_MSG, DEATH_SELF_BETRAYAL, NORMAL_POS) \ + DEATHTYPE(DEATH_TOUCHEXPLODE, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_CHEAT, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_FIRE, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_VHCRUSH, NO_MSG, NO_MSG, DEATH_VHFIRST) \ + DEATHTYPE(DEATH_SBMINIGUN, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_SBROCKET, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_SBBLOWUP, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_WAKIGUN, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_WAKIROCKET, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_WAKIBLOWUP, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_RAPTOR_CANNON, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_RAPTOR_BOMB, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_RAPTOR_BOMB_SPLIT, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_RAPTOR_DEATH, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_BUMB_GUN, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_BUMB_RAY, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_BUMB_RAY_HEAL, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_BUMB_DEATH, NO_MSG, NO_MSG, DEATH_VHLAST) \ + DEATHTYPE(DEATH_TURRET, NO_MSG, NO_MSG, DEATH_TURRET_FIRST) \ + DEATHTYPE(DEATH_TURRET_EWHEEL, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_FLAC, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_MACHINEGUN, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_WALKER_GUN, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_WALKER_MEELE, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_WALKER_ROCKET, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_HELLION, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_HK, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_MLRS, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_PLASMA, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_PHASER, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_TURRET_TESLA, NO_MSG, NO_MSG, DEATH_TURRET_LAST) \ + DEATHTYPE(DEATH_GENERIC, NO_MSG, DEATH_SELF_GENERIC, NORMAL_POS) \ + DEATHTYPE(DEATH_WEAPON, NO_MSG, NO_MSG, NORMAL_POS) \ + DEATHTYPE(DEATH_CUSTOM, NO_MSG, DEATH_SELF_CUSTOM, NORMAL_POS) DEATHTYPES #undef DEATHTYPE diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc index bbca56d7f..1ce6948a9 100644 --- a/qcsrc/common/notifications.qc +++ b/qcsrc/common/notifications.qc @@ -11,6 +11,7 @@ #define NO_STR_ARG "" #define NO_FL_ARG -12345 +#define NO_MSG -12345 #define F_NAME 1 #define F_STRNUM 2 @@ -150,22 +151,22 @@ float Form_Score_Pos(entity player) #endif #define MSG_INFO_NOTIFICATIONS \ MSG_INFO_NOTIF(INFO_EMPTY, 0, 0, NO_STR_ARG, XPND2("", ""), "", "", "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_CUSTOM, 1, 0, s1, XPND2(s1, ""), "notify_death", _("^FG%s^K1\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_GENERIC, 1, 0, s1, XPND2(s1, ""), "notify_void", _("^FG%s^K1\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_SELFKILL, 0, 0, NO_STR_ARG, XPND2(s1, ""), "notify_selfkill", _("^FG%s^K1\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_SUICIDE, 1, 0, s1, XPND2(s1, ""), "notify_selfkill", _("^FG%s^K1 couldn't take it anymore\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_NOAMMO, 0, 0, NO_STR_ARG, XPND2(s1, ""), "notify_outofammo", _("^FG%s^K1\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_ROT, 0, 0, NO_STR_ARG, XPND2(s1, ""), "notify_death", _("^FG%s^K1\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_CAMP, 1, 0, NO_STR_ARG, XPND2(s1, ""), "notify_camping", _("^FG%s^K1\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_BETRAYAL, 0, 0, NO_STR_ARG, XPND2("", ""), "", _("^FG%s^K1\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_TEAMCHANGE, 1, 1, XPND2(s1, DEATH_TEAM), XPND2("", ""), "", _("^FG%s^K1 switched to the %s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_AUTOTEAMCHANGE, 1, 1, XPND2(s1, DEATH_TEAM), XPND2("", ""), "", _("^FG%s^K1 was moved into the %s\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_FALL, 1, 0, s1, XPND2(s1, ""), "notify_fall", _("^FG%s^K1 hit the ground with a crunch\n"), _("^FG%s^K1 hit the ground with a bit too much force\n")) \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_DROWN, 1, 0, s1, XPND2(s1, ""), "notify_water", _("^FG%s^K1 couldn't catch their breath\n"), _("^FG%s^K1 was in the water for too long\n")) \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_LAVA, 1, 0, s1, XPND2(s1, ""), "notify_lava", _("^FG%s^K1 turned into hot slag\n"), _("^FG%s^K1 found a hot place\n")) \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_SLIME, 1, 0, s1, XPND2(s1, ""), "notify_slime", _("^FG%s^K1 was slimed\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_SHOOTING_STAR, 1, 0, s1, XPND2(s1, ""), "notify_shootingstar", _("^FG%s^K1\n"), "") \ - MSG_INFO_NOTIF(INFO_DEATH_SELF_SWAMP, 0, 0, NO_STR_ARG, XPND2("", ""), "", _("^FG%s^K1\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_CUSTOM, 1, 0, s1, XPND2(s1, ""), "notify_death", _("^F1%s^K1\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_GENERIC, 1, 0, s1, XPND2(s1, ""), "notify_void", _("^F1%s^K1\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_SELFKILL, 1, 0, s1, XPND2(s1, ""), "notify_selfkill", _("^F1%s^K1\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_SUICIDE, 1, 0, s1, XPND2(s1, ""), "notify_selfkill", _("^F1%s^K1 couldn't take it anymore\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_NOAMMO, 1, 0, s1, XPND2(s1, ""), "notify_outofammo", _("^F1%s^K1\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_ROT, 1, 0, s1, XPND2(s1, ""), "notify_death", _("^F1%s^K1\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_CAMP, 1, 0, s1, XPND2(s1, ""), "notify_camping", _("^F1%s^K1\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_BETRAYAL, 1, 1, s1, XPND2("", ""), "", _("^F1%s^K1\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_TEAMCHANGE, 1, 1, XPND2(s1, DEATH_TEAM), XPND2("", ""), "", _("^F1%s^K1 switched to the %s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_AUTOTEAMCHANGE, 1, 1, XPND2(s1, DEATH_TEAM), XPND2("", ""), "", _("^F1%s^K1 was moved into the %s\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_FALL, 1, 0, s1, XPND2(s1, ""), "notify_fall", _("^F1%s^K1 hit the ground with a crunch\n"), _("^F1%s^K1 hit the ground with a bit too much force\n")) \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_DROWN, 1, 0, s1, XPND2(s1, ""), "notify_water", _("^F1%s^K1 couldn't catch their breath\n"), _("^F1%s^K1 was in the water for too long\n")) \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_LAVA, 1, 0, s1, XPND2(s1, ""), "notify_lava", _("^F1%s^K1 turned into hot slag\n"), _("^F1%s^K1 found a hot place\n")) \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_SLIME, 1, 0, s1, XPND2(s1, ""), "notify_slime", _("^F1%s^K1 was slimed\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_SHOOTING_STAR, 1, 0, s1, XPND2(s1, ""), "notify_shootingstar", _("^F1%s^K1\n"), "") \ + MSG_INFO_NOTIF(INFO_DEATH_SELF_SWAMP, 1, 0, s1, XPND2("", ""), "", _("^F1%s^K1\n"), "") \ MULTITEAM_INFO(INFO_SCORES_, 4, 0, 0, NO_STR_ARG, XPND2("", ""), "", _("^TC^TT ^BGteam scores!\n"), "") \ MULTITEAM_INFO(INFO_CTF_FLAGRETURN_DROPPED_, 2, 0, 0, NO_STR_ARG, XPND2("", ""), "", _("^BGThe ^TC^TT^BG flag was dropped in the base and returned itself\n"), "") \ MULTITEAM_INFO(INFO_CTF_FLAGRETURN_DAMAGED_, 2, 0, 0, NO_STR_ARG, XPND2("", ""), "", _("^BGThe ^TC^TT^BG flag was destroyed and returned to base\n"), "") \ @@ -262,22 +263,22 @@ float Form_Score_Pos(entity player) MSG_DEATH_NOTIF(DEATH_SELF_SLIME, CENTER_DEATH_SELF_SLIME, INFO_DEATH_SELF_SLIME) \ MSG_DEATH_NOTIF(DEATH_SELF_SHOOTING_STAR, CENTER_DEATH_SELF_SHOOTING_STAR, INFO_DEATH_SELF_SHOOTING_STAR) \ MSG_DEATH_NOTIF(DEATH_SELF_SWAMP, CENTER_DEATH_SELF_SWAMP, INFO_DEATH_SELF_SWAMP) \ - MSG_DEATH_NOTIF(DEATH_MURDER_FRAG, CENTER_DEATH_MURDER_FRAG, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED, CENTER_DEATH_MURDER_FRAGGED, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG, CENTER_DEATH_MURDER_TYPEFRAG, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED, CENTER_DEATH_MURDER_TYPEFRAGGED, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_FIRST, CENTER_DEATH_MURDER_FRAG_FIRST, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_FIRST, CENTER_DEATH_MURDER_FRAGGED_FIRST, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_FIRST, CENTER_DEATH_MURDER_TYPEFRAG_FIRST, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_FIRST, CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_VERBOSE, CENTER_DEATH_MURDER_FRAG_VERBOSE, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_VERBOSE, CENTER_DEATH_MURDER_FRAGGED_VERBOSE, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_VERBOSE, CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_VERBOSE, CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_FIRST_VERBOSE, CENTER_DEATH_MURDER_FRAG_FIRST_VERBOSE, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_FIRST_VERBOSE, CENTER_DEATH_MURDER_FRAGGED_FIRST_VERBOSE, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE, CENTER_DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE, FALSE) \ - MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE, CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE, FALSE) + MSG_DEATH_NOTIF(DEATH_MURDER_FRAG, CENTER_DEATH_MURDER_FRAG, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED, CENTER_DEATH_MURDER_FRAGGED, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG, CENTER_DEATH_MURDER_TYPEFRAG, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED, CENTER_DEATH_MURDER_TYPEFRAGGED, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_FIRST, CENTER_DEATH_MURDER_FRAG_FIRST, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_FIRST, CENTER_DEATH_MURDER_FRAGGED_FIRST, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_FIRST, CENTER_DEATH_MURDER_TYPEFRAG_FIRST, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_FIRST, CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_VERBOSE, CENTER_DEATH_MURDER_FRAG_VERBOSE, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_VERBOSE, CENTER_DEATH_MURDER_FRAGGED_VERBOSE, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_VERBOSE, CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_VERBOSE, CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAG_FIRST_VERBOSE, CENTER_DEATH_MURDER_FRAG_FIRST_VERBOSE, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED_FIRST_VERBOSE, CENTER_DEATH_MURDER_FRAGGED_FIRST_VERBOSE, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE, CENTER_DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE, NO_MSG) \ + MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE, CENTER_DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE, NO_MSG) // ==================================== @@ -529,9 +530,7 @@ void Local_Notification(float net_type, float net_name, string s1, string s2, fl { NOTIF_MATCH(name, net_name) CHECK_AUTOCVAR(name) \ { \ print(sprintf(CCR(normal_or_gentle(normal, gentle)), args)); \ - #if 4 \ - HUD_Notify_Push(icon, hudargs); \ - #endif \ + if(strtolower(icon) != "") { HUD_Notify_Push(icon, hudargs); } \ } } MSG_INFO_NOTIFICATIONS #undef MSG_INFO_NOTIF @@ -564,10 +563,10 @@ void Local_Notification(float net_type, float net_name, string s1, string s2, fl #define MSG_DEATH_NOTIF(name,centername,infoname) \ { NOTIF_MATCH(name, net_name) CHECK_AUTOCVAR(name) \ { \ - #if centername != 0 \ + #if centername != NO_MSG \ Local_Notification(MSG_CENTER, centername, s1, s2, f1, f2, f3); \ #endif \ - #if infoname != 0 \ + #if infoname != NO_MSG \ Local_Notification(MSG_INFO, infoname, s1, s2, f1, f2, f3); \ #endif \ } } @@ -592,6 +591,8 @@ void Read_Notification(void) float stringcount = stof(Get_Field_Value(F_STRNUM, net_type, net_name)); float floatcount = stof(Get_Field_Value(F_FLNUM, net_type, net_name)); + + print("stringcount = ", ftos(stringcount), ", floatcount = ", ftos(floatcount), ".\n"); Local_Notification(net_type, net_name, ((stringcount >= 1) ? ReadString() : ""), diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 1573a8a3d..b251d1842 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -316,24 +316,22 @@ void Obituary_SpecialDeath(entity notif_target, float murder, float deathtype, s #define DEATHTYPE(name,msg_death_by,msg_death,position) \ { if(deathtype == max(0, name)) \ { \ - if(murder) \ - { \ - #if msg_death_by \ + #if msg_death_by != NO_MSG \ + if(murder) \ { \ Send_Notification(notif_target, MSG_ONE, MSG_DEATH, msg_death_by, s1, s2, f1, f2, f3); \ Send_Notification_ToAll(notif_target, TRUE, MSG_INFO, INFO_##msg_death_by, s1, s2, f1, f2, f3); \ ++handled; \ } \ - #endif \ - } else { \ - #if msg_death \ + #else \ + #if msg_death != NO_MSG \ + if not(murder) \ { \ Send_Notification(notif_target, MSG_ONE, MSG_DEATH, msg_death, s1, s2, f1, f2, f3); \ Send_Notification_ToAll(notif_target, TRUE, MSG_INFO, INFO_##msg_death, s1, s2, f1, f2, f3); \ ++handled; \ } \ - #endif \ - } \ + #endif \ ++hits; \ } } @@ -425,7 +423,8 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) default: { - s1 = s2 = NO_STR_ARG; + s1 = targ.netname; + s2 = NO_STR_ARG; f1 = f2 = f3 = NO_FL_ARG; break; } -- 2.39.2