I started typing this commit message and then forgot what it's about

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 4cc5b0758de3c49ad8d795900df090d8c7de13c1..aa4ebe1e4a3373b000521cc097971ff2ba1f26f6 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -17,9 +17,6 @@
 
 #define NO_MSG -12345 
 
-// ping of bots defined for extra frag message notification information
-#define BOT_PING -1
-
 #define EIGHT_VARS_TO_VARARGS_VARLIST \
        VARITEM(1, 0, s1) \
        VARITEM(2, 0, XPD(s1, s2)) \
@@ -198,7 +195,7 @@ void Send_CSQC_Centerprint_Generic_Expire(entity e, float id);
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_MLRS,                          1, 1, "s1 spree_end", "s1",                     "notify_death",                 _("^BG%s^K1 got turned into smoldering gibs by an MLRS turret%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_PLASMA,                        1, 1, "s1 spree_end", "s1",                     "notify_death",                 _("^BG%s^K1 got served some superheated plasma from a turret%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_PHASER,                        1, 1, "s1 spree_end", "s1",                     "notify_death",                 _("^BG%s^K1 was phased out by a turret%s\n"), "") \
-       MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_TESLA,                 1, 1, "s1 spree_end", "s1",                             "notify_death",                 _("^BG%s^K1 was electrocuted by a Tesla turret%s\n"), "") \
+       MSG_INFO_NOTIF(1, INFO_DEATH_SELF_TURRET_TESLA,                         1, 1, "s1 spree_end", "s1",                             "notify_death",                 _("^BG%s^K1 was electrocuted by a Tesla turret%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_TELEFRAG,                   2, 1, "s1 s2 spree_end", "s2 s1",               "notify_telefrag",              _("^BG%s^K1 was telefragged by ^BG%s^K1%s\n"), _("^F1%s^K1 tried to occupy ^BG%s^K1's teleport destination space\n")) \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_FALL,                               2, 1, "s1 s2 spree_end", "s2 s1",               "notify_fall",                  _("^BG%s^K1 was grounded by ^BG%s^K1%s\n"), "") \
        MSG_INFO_NOTIF(1, INFO_DEATH_MURDER_DROWN,                              2, 1, "s1 s2 spree_end", "s2 s1",               "notify_water",                 _("^BG%s^K1 was drowned by ^BG%s^K1%s\n"), "") \
@@ -594,11 +591,11 @@ string arg_slot[NOTIF_MAX_ARGS];
        ARG_CASE(ARG_DOUBLE, "f2",                              ftos(f2)) \
        ARG_CASE(ARG_DOUBLE, "f3",                              ftos(f3)) \
        ARG_CASE(ARG_DOUBLE, "f4",                              ftos(f4)) \
-       ARG_CASE(ARG_DOUBLE, "f1p2dec",                         ftos_decimals(f1/100, 2)) \
-       ARG_CASE(ARG_DOUBLE, "f2p2dec",                         ftos_decimals(f2/100, 2)) \
+       ARG_CASE(ARG_DOUBLE, "f1p2dec",                 ftos_decimals(f1/100, 2)) \
+       ARG_CASE(ARG_DOUBLE, "f2p2dec",                 ftos_decimals(f2/100, 2)) \
        ARG_CASE(ARG_CSQC, "pass_key",                  ((((tmp_s = getcommandkey("pass", "+use")) != "pass") && !(strstrofs(tmp_s, "not bound", 0) >= 0)) ? sprintf(CCR(_(" ^F1(Press %s)")), tmp_s) : "")) \
-       ARG_CASE(ARG_CSQC, "frag_ping",                 ((f2 != BOT_PING) ? sprintf(CCR(_("\n(Ping ^2%d^BG)")), f2) : "")) \
-       ARG_CASE(ARG_CSQC, "frag_stats",                sprintf(CCR(_("\n(Health ^1%d^BG / Armor ^2%d^BG)%s")), f1, f2, ((f3 != BOT_PING) ? sprintf(CCR(_(" (Ping ^2%d^BG)")), f3) : ""))) \
+       ARG_CASE(ARG_CSQC, "frag_ping",                 ((f2 != NO_MSG) ? sprintf(CCR(_("\n(Ping ^2%d^BG)")), f2) : "")) \
+       ARG_CASE(ARG_CSQC, "frag_stats",                sprintf(CCR(_("\n(Health ^1%d^BG / Armor ^2%d^BG)%s")), f1, f2, ((f3 != NO_MSG) ? sprintf(CCR(_(" (Ping ^2%d^BG)")), f3) : ""))) \
        /*ARG_CASE(ARG_CSQC, "frag_pos",                        ((Should_Print_Score_Pos(f1)) ? sprintf("\n^BG%s", Read_Score_Pos(f1)) : ""))*/ \
        ARG_CASE(ARG_CSQC, "spree_cen",                 (((f1 == 3) || (f1 == 5) || (f1 == 10) || (f1 == 15) || (f1 == 20) || (f1 == 25) || (f1 == 30)) ? sprintf(normal_or_gentle(_("%d frag spree! "), _("%d score spree! ")), f1) : "")) \
        ARG_CASE(ARG_CSQC, "spree_inf",                 (((f1 == 3) || (f1 == 5) || (f1 == 10) || (f1 == 15) || (f1 == 20) || (f1 == 25) || (f1 == 30)) ? sprintf(normal_or_gentle(_("%d frag spree! "), _("%d score spree! ")), f1) : "")) \

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index c761fe116db6d8a380b5eb4665023f398063c47a..a7ed958df1fae026fb257c317954a665df6101b3 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -484,24 +484,24 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
                                if(targ.istypefrag)
                                {
                                        if(attacker.FRAG_VERBOSE)
-                                               Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE, s2, s1, ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping));
+                                               Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_TYPEFRAG_FIRST_VERBOSE, s2, s1, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
                                        else
                                                Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_TYPEFRAG_FIRST, s2, s1);
 
                                        if(targ.FRAG_VERBOSE)
-                                               Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE, s1, attacker.health, attacker.armorvalue, ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping));
+                                               Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_TYPEFRAGGED_FIRST_VERBOSE, s1, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
                                        else
                                                Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_TYPEFRAGGED_FIRST, s1);
                                }
                                else
                                {
                                        if(attacker.FRAG_VERBOSE)
-                                               Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_FRAG_FIRST_VERBOSE, s2, s1, ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping));
+                                               Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_FRAG_FIRST_VERBOSE, s2, s1, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
                                        else
                                                Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_FRAG_FIRST, s2, s1);
 
                                        if(targ.FRAG_VERBOSE)
-                                               Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_FRAGGED_FIRST_VERBOSE, s1, attacker.health, attacker.armorvalue, ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping));
+                                               Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_FRAGGED_FIRST_VERBOSE, s1, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
                                        else
                                                Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_FRAGGED_FIRST, s1);
                                }
@@ -511,24 +511,24 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
                                if(targ.istypefrag)
                                {
                                        if(attacker.FRAG_VERBOSE)
-                                               Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_TYPEFRAG_VERBOSE, s2, attacker.killcount, ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping));
+                                               Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_TYPEFRAG_VERBOSE, s2, attacker.killcount, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
                                        else
                                                Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_TYPEFRAG, s2, attacker.killcount);
 
                                        if(targ.FRAG_VERBOSE)
-                                               Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_TYPEFRAGGED_VERBOSE, s1, attacker.health, attacker.armorvalue, ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping));
+                                               Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_TYPEFRAGGED_VERBOSE, s1, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
                                        else
                                                Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_TYPEFRAGGED, s1);
                                }
                                else
                                {
                                        if(attacker.FRAG_VERBOSE)
-                                               Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_FRAG_VERBOSE, s2, attacker.killcount, ((clienttype(targ) == CLIENTTYPE_BOT) ? BOT_PING : targ.ping));
+                                               Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_FRAG_VERBOSE, s2, attacker.killcount, (IS_BOT_CLIENT(targ) ? NO_MSG : targ.ping));
                                        else
                                                Send_Notification(NOTIF_ONE, attacker, MSG_DEATH, DEATH_MURDER_FRAG, s2, attacker.killcount);
 
                                        if(targ.FRAG_VERBOSE)
-                                               Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_FRAGGED_VERBOSE, s1, attacker.health, attacker.armorvalue, ((clienttype(attacker) == CLIENTTYPE_BOT) ? BOT_PING : attacker.ping));
+                                               Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_FRAGGED_VERBOSE, s1, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? NO_MSG : attacker.ping));
                                        else
                                                Send_Notification(NOTIF_ONE, targ, MSG_DEATH, DEATH_MURDER_FRAGGED, s1);
                                }