Update arg table

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 6175b3563e663237abc9ab4982c9cf6f755d61c6..a1775fb961d13235d8dbf667f060510db0cb29c3 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -624,7 +624,7 @@ var float autocvar_notification_lifetime_mapload = 10;
 void Notification_GetCvars(void);
 #else
 var float autocvar_notification_item_centerprinttime = 1.5;
-var float autocvar_notification_allow_chatboxprint = 1; // 0 = no, 1 = yes, 2 = forced on for all MSG_INFO notifs // todo set back to 1 after testing
+var float autocvar_notification_allow_chatboxprint = 1; // 0 = no, 1 = yes, 2 = forced on for all MSG_INFO notifs
 var float autocvar_notification_show_sprees_center = TRUE;
 var float autocvar_notification_show_sprees_center_specialonly = TRUE;
 var float autocvar_notification_frag_verbose = TRUE;
@@ -660,6 +660,11 @@ var float autocvar_notification_frag_verbose = TRUE;
     f1secs: count_seconds of f1
     f1ord: count_ordinal of f1
     f1time: process_time of f1
+    f1race_time: mmssss of f1
+    f2race_time: mmssss of f2
+    race_col: color of race time/position (i.e. good or bad)
+    race_diff: show time difference between f2 and f3
+    kh_teams: show which teams still need players in keyhunt centerprint
     pass_key: find the keybind for "passing" or "dropping" in CTF game mode
     frag_ping: show the ping of a player
     frag_stats: show health/armor/ping of a player
@@ -672,9 +677,6 @@ var float autocvar_notification_frag_verbose = TRUE;
     item_wepammo: ammo display for weapon from string
     item_centime: amount of time to display weapon message in centerprint
     death_team: show the full name of the team a player is switching from
-    kh_teams: show which teams still need players in keyhunt centerprint
-    race_time: mmssss of f2
-    race_diff: show time difference between f2 and f3
 */
 
 #define NOTIF_MAX_ARGS 7
@@ -715,6 +717,7 @@ string arg_slot[NOTIF_MAX_ARGS];
        ARG_CASE(ARG_CS_SV,                     "f2race_time",          mmssss(f2)) \
        ARG_CASE(ARG_CS_SV,                     "race_col",                     CCR(((f1 == 1) ? "^F1" : "^F2"))) \
        ARG_CASE(ARG_CS_SV,             "race_diff",            ((f2 > f3) ? sprintf(CCR("^1[+%s]"), mmssss(f2 - f3)) : sprintf(CCR("^2[-%s]"), mmssss(f3 - f2)))) \
+       ARG_CASE(ARG_CS,                        "kh_teams",             notif_arg_kh_teams(f1, f2, f3, f4)) \
        ARG_CASE(ARG_CS,                        "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_CS,                        "frag_ping",            ((f2 != NO_MSG) ? sprintf(CCR(_("\n(Ping ^2%d^BG)")), f2) : "")) \
        ARG_CASE(ARG_CS,                        "frag_stats",           sprintf(CCR(_("\n(Health ^1%d^BG / Armor ^2%d^BG)%s")), f2, f3, ((f4 != NO_MSG) ? sprintf(CCR(_(" (Ping ^2%d^BG)")), f4) : ""))) \
@@ -727,8 +730,7 @@ string arg_slot[NOTIF_MAX_ARGS];
        ARG_CASE(ARG_CS_SV,                     "item_wepammo",         (s1 != "" ? sprintf(_(" with %s"), s1) : "")) \
        ARG_CASE(ARG_DC,                        "item_centime",         ftos(autocvar_notification_item_centerprinttime)) \
        ARG_CASE(ARG_SV,                        "death_team",           Team_ColoredFullName(f1)) \
-       ARG_CASE(ARG_CS,                        "death_team",           Team_ColoredFullName(f1 - 1)) \
-       ARG_CASE(ARG_CS,                        "kh_teams",             notif_arg_kh_teams(f1, f2, f3, f4))
+       ARG_CASE(ARG_CS,                        "death_team",           Team_ColoredFullName(f1 - 1))
 
 #define NOTIF_HIT_MAX(count,funcname) if(sel_num == count) { backtrace(sprintf("%s: Hit maximum arguments!\n", funcname)); break; }
 #define NOTIF_HIT_UNKNOWN(token,funcname) { backtrace(sprintf("%s: Hit unknown token in selected string! '%s'\n", funcname, selected)); break; }