]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/notifications.qc
Updates to how frag sprees are shown in info notifications
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / notifications.qc
index eac793afb61fec7f5ebe10022687bca0826b434d..d0bf7bb053a6fbc29a869a2b0cfec2c19ed1a074 100644 (file)
@@ -3,7 +3,6 @@
 //  Last updated: February, 2013
 // ================================================
 
-#ifndef MENUQC
 entity Get_Notif_Ent(float net_type, float net_name)
 {
        switch(net_type)
@@ -17,47 +16,6 @@ entity Get_Notif_Ent(float net_type, float net_name)
        return world;
 }
 
-string Get_Notif_Name(float net_type, float net_name)
-{
-       entity e = Get_Notif_Ent(net_type, net_name);
-       if(e) { return e.nent_name; }
-       backtrace(sprintf("Get_Notif_Name(%d, %d): Could not find entity!\n", net_type, net_name));
-       return "";
-}
-
-float Get_Notif_Infval(float net_type, float net_name)
-{
-       entity e = Get_Notif_Ent(net_type, net_name);
-       if(e) { return e.nent_infoname; }
-       backtrace(sprintf("Get_Notif_Infval(%d, %d): Could not find entity!\n", net_type, net_name));
-       return NO_MSG;
-}
-
-float Get_Notif_Cenval(float net_type, float net_name)
-{
-       entity e = Get_Notif_Ent(net_type, net_name);
-       if(e) { return e.nent_centername; }
-       backtrace(sprintf("Get_Notif_Cenval(%d, %d): Could not find entity!\n", net_type, net_name));
-       return NO_MSG;
-}
-
-float Get_Notif_Strnum(float net_type, float net_name)
-{
-       entity e = Get_Notif_Ent(net_type, net_name);
-       if(e) { return e.nent_stringcount; }
-       backtrace(sprintf("Get_Notif_Strnum(%d, %d): Could not find entity!\n", net_type, net_name));
-       return NO_MSG;
-}
-
-float Get_Notif_Flnum(float net_type, float net_name)
-{
-       entity e = Get_Notif_Ent(net_type, net_name);
-       if(e) { return e.nent_floatcount; }
-       backtrace(sprintf("Get_Notif_Flnum(%d, %d): Could not find entity!\n", net_type, net_name));
-       return NO_MSG;
-}
-#endif // ifndef MENUQC
-
 
 // ===============================
 //  Frontend Notification Pushing
@@ -65,117 +23,179 @@ float Get_Notif_Flnum(float net_type, float net_name)
 
 void Dump_Notifications(float fh, float alsoprint)
 {
-       float MSG_INFO_NOTIFS = 0, MSG_CENTER_NOTIFS = 0, MSG_WEAPON_NOTIFS = 0, MSG_DEATH_NOTIFS = 0;
-
-       #define NOTIF_WRITE(type,name,text) { \
-               ++##type##_NOTIFS; \
-               notif_msg = sprintf("seta %s 1 // %s - %s\n", name, #type, strreplace("\n", "\\n", text)); \
-               fputs(fh, notif_msg); \
-               if(alsoprint) { print(strreplace("^", "^^", notif_msg)); } }
+       #define NOTIF_WRITE(a) { \
+               fputs(fh, a); \
+               if(alsoprint) { print(a); } }
+       #define NOTIF_WRITE_SETA(name,default,text) { \
+               notif_msg = \
+                       sprintf( \
+                               "seta notification_%s %d \"notif string: %s^7\"\n", \
+                               name, default, strreplace("\{3}", "", strreplace("\n", "\\n", text)) \
+                       ); \
+               NOTIF_WRITE(notif_msg) }
 
-       #ifndef MENUQC
        string notif_msg;
        float i;
        entity e;
 
-       for(i = 0; i < NOTIF_INFO_COUNT; ++i) {
+       // Note: This warning only applies to the notifications.cfg file that is output...
+
+       // You ARE supposed to manually edit this function to add i.e. hard coded
+       // notification variables for mutators or game modes or such and then
+       // regenerate the notifications.cfg file from the new code.
+
+       NOTIF_WRITE("// ********************************************** //\n");
+       NOTIF_WRITE("// ** WARNING - DO NOT MANUALLY EDIT THIS FILE ** //\n");
+       NOTIF_WRITE("// **                                          ** //\n");
+       NOTIF_WRITE("// **  This file is automatically generated    ** //\n");
+       NOTIF_WRITE("// **  by code with the command 'dumpnotifs'.  ** //\n");
+       NOTIF_WRITE("// **                                          ** //\n");
+       NOTIF_WRITE("// **  If you add a new notification, please   ** //\n");
+       NOTIF_WRITE("// **  regenerate this file with that command  ** //\n");
+       NOTIF_WRITE("// **  making sure that the output matches     ** //\n");
+       NOTIF_WRITE("// **  with the lists and defaults in code.    ** //\n");
+       NOTIF_WRITE("// **                                          ** //\n");
+       NOTIF_WRITE("// ********************************************** //\n");
+
+       NOTIF_WRITE("\n// Version number to identify mismatches between code and config file...\n");
+       NOTIF_WRITE("// Increment NOTIF_VERSION in common/notifications.qh with any\n");
+       NOTIF_WRITE("// new notifications or other changes to notif cvars/this config.\n");
+       
+       NOTIF_WRITE(sprintf("set notification_version %d\n", NOTIF_VERSION));
+
+       // These notifications will also append their string as a comment...
+       // This is not necessary, and does not matter if they vary between config versions,
+       // it is just a semi-helpful tool for those who want to manually change their user settings.
+
+       NOTIF_WRITE(sprintf("\n// MSG_INFO notifications (count = %d):\n", NOTIF_INFO_COUNT));
+       for(i = 1; i <= NOTIF_INFO_COUNT; ++i)
+       {
                e = Get_Notif_Ent(MSG_INFO, i);
-               NOTIF_WRITE(MSG_INFO, e.nent_name, e.nent_string); }
-               
-       for(i = 0; i < NOTIF_CENTER_COUNT; ++i) {
+               if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
+               NOTIF_WRITE_SETA(e.nent_name, e.nent_default, e.nent_string);
+       }
+
+       NOTIF_WRITE(sprintf("\n// MSG_CENTER notifications (count = %d):\n", NOTIF_CENTER_COUNT));
+       for(i = 1; i <= NOTIF_CENTER_COUNT; ++i)
+       {
                e = Get_Notif_Ent(MSG_CENTER, i);
-               NOTIF_WRITE(MSG_CENTER, e.nent_name, e.nent_string); }
-       
-       for(i = 0; i < NOTIF_WEAPON_COUNT; ++i) {
+               if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
+               NOTIF_WRITE_SETA(e.nent_name, e.nent_default, e.nent_string);
+       }
+
+       NOTIF_WRITE(sprintf("\n// MSG_WEAPON notifications (count = %d):\n", NOTIF_WEAPON_COUNT));
+       for(i = 1; i <= NOTIF_WEAPON_COUNT; ++i)
+       {
                e = Get_Notif_Ent(MSG_WEAPON, i);
-               NOTIF_WRITE(MSG_WEAPON, e.nent_name, sprintf("infoname: %s, centername: %s",
-                       Get_Notif_Name(MSG_INFO, Get_Notif_Infval(MSG_WEAPON, i)),
-                       Get_Notif_Name(MSG_CENTER, Get_Notif_Cenval(MSG_WEAPON, i)) ) ); }
-               
-       for(i = 0; i < NOTIF_DEATH_COUNT; ++i) {
+               if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
+               NOTIF_WRITE_SETA(e.nent_name, e.nent_default, sprintf("infoname: %s, centername: %s",
+                       e.nent_msginfo.nent_name, e.nent_msgcenter.nent_name));
+       }
+
+       NOTIF_WRITE(sprintf("\n// MSG_DEATH notifications (count = %d):\n", NOTIF_DEATH_COUNT));
+       for(i = 1; i <= NOTIF_DEATH_COUNT; ++i)
+       {
                e = Get_Notif_Ent(MSG_DEATH, i);
-               NOTIF_WRITE(MSG_DEATH, e.nent_name, sprintf("infoname: %s, centername: %s",
-                       Get_Notif_Name(MSG_INFO, Get_Notif_Infval(MSG_DEATH, i)),
-                       Get_Notif_Name(MSG_CENTER, Get_Notif_Cenval(MSG_DEATH, i)) ) ); }
-               
-       #endif
+               if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
+               NOTIF_WRITE_SETA(e.nent_name, e.nent_default, sprintf("infoname: %s, centername: %s",
+                       e.nent_msginfo.nent_name, e.nent_msgcenter.nent_name));
+       }
 
-       print(sprintf("Notification counts: MSG_INFO = %d, MSG_CENTER = %d, MSG_WEAPON = %d, MSG_DEATH = %d\n",
-               MSG_INFO_NOTIFS, MSG_CENTER_NOTIFS, MSG_WEAPON_NOTIFS, MSG_DEATH_NOTIFS));
+       // edit these to match whichever cvars are used for specific notification options
+       NOTIF_WRITE("\n// HARD CODED notification variables:\n");
+       NOTIF_WRITE("seta notification_allow_chatboxprint 1 \"Allow notifications to be printed to chat box by setting notification cvar to 2 (You can also set this cvar to 2 to force ALL notifications to be printed to the chatbox)\"\n");
+       NOTIF_WRITE("seta notification_show_sprees 1 \"Print information about sprees in death/kill messages\"\n");
+       NOTIF_WRITE("seta notification_version_mismatch_client_error 0 \"Cause a notif error on client if the version in notifications.cfg mismatches the code\"\n");
+       NOTIF_WRITE("seta notification_version_mismatch_server_error 1 \"Cause a notif error on server if the version in notifications.cfg mismatches the code\"\n");
+       NOTIF_WRITE("seta notification_errors_are_fatal 1 \"If a notification fails upon initialization, cause a Host_Error to stop the program\"\n");
+       NOTIF_WRITE("seta notification_ctf_pickup_team_verbose 1 \"Show extra information if a team mate picks up a flag\"\n");
+       NOTIF_WRITE("seta notification_ctf_pickup_enemy_verbose 1 \"Show extra information if an enemy picks up a flag\"\n");
+       NOTIF_WRITE("seta notification_ctf_capture_verbose 1 \"Show extra information when someone captures a flag\"\n");
+       NOTIF_WRITE("seta notification_frag_verbose 1 \"Show extra information when you frag someone (or when you are fragged\"\n");
+
+       NOTIF_WRITE(sprintf("\n// Notification counts (total = %d): MSG_INFO = %d, MSG_CENTER = %d, MSG_WEAPON = %d, MSG_DEATH = %d\n",
+               (NOTIF_INFO_COUNT + NOTIF_CENTER_COUNT + NOTIF_WEAPON_COUNT + NOTIF_DEATH_COUNT), 
+               NOTIF_INFO_COUNT, NOTIF_CENTER_COUNT, NOTIF_WEAPON_COUNT, NOTIF_DEATH_COUNT));
        
        return;
+       #undef NOTIF_WRITE_SETA
        #undef NOTIF_WRITE
 }
 
-#ifndef MENUQC
+#ifdef SVQC
+void Notification_GetCvars()
+{
+       GetCvars_handleFloat(get_cvars_s, get_cvars_f, FRAG_VERBOSE, "notification_frag_verbose");
+}
+#endif
+
 string Local_Notification_sprintf(string input, string args, 
        string s1, string s2, string s3, string s4,
        float f1, float f2, float f3, float f4)
 {
        #ifdef NOTIFICATIONS_DEBUG
-       dprint(sprintf("Local_Notification_sprintf('%s^7', '%s', %s, %s);\n",
-               strreplace("\n", "\\n", input), args,
-               sprintf("'%s^7', '%s^7', '%s^7', '%s^7'", s1, s2, s3, s4),
-               sprintf("%d, %d, %d, %d", f1, f2, f3, f4)));
+       dprint(
+               sprintf("Local_Notification_sprintf('%s^7', '%s', %s, %s);\n",
+                       strreplace("\n", "\\n", input),
+                       args,
+                       sprintf("'%s^7', '%s^7', '%s^7', '%s^7'", s1, s2, s3, s4),
+                       sprintf("%d, %d, %d, %d", f1, f2, f3, f4)
+               )
+       );
        #endif
        
-       string selected, remaining = args;
-       float sel_num = 0;
-       
+       string selected;
+       float sel_num;
+       for(sel_num = 0; sel_num < NOTIF_MAX_ARGS; ++sel_num) { arg_slot[sel_num] = ""; }
+
        #ifdef CSQC
        string tmp_s;
        #endif
-       
-       if((remaining != "") && (input != ""))
+
+       for(sel_num = 0;(args != "");)
        {
-               arg_slot[0] = ""; arg_slot[1] = ""; arg_slot[2] = ""; arg_slot[3] = ""; arg_slot[4] = ""; arg_slot[5] = ""; arg_slot[6] = "";
-               for(;remaining;)
+               selected = car(args); args = cdr(args);
+               NOTIF_HIT_MAX(NOTIF_MAX_ARGS, "Local_Notification_sprintf")
+               switch(strtolower(selected))
                {
-                       selected = car(remaining); remaining = cdr(remaining);
-                       if(sel_num == 7) { backtrace("Local_Notification_sprintf: Hit maximum arguments!\n"); break; }
-                       switch(strtolower(selected))
-                       {
-                               #define ARG_CASE(prog,selected,result) \
-                                       #ifdef CSQC \
-                                       #if (prog == ARG_BOTH) || (prog == ARG_CSQC) \
+                       #define ARG_CASE(prog,selected,result) \
+                               #ifdef CSQC \
+                                       #if (prog == ARG_DOUBLE) || (prog == ARG_TRIPLE) || (prog == ARG_CSQC) \
                                                case selected: { arg_slot[sel_num] = result; ++sel_num; break; } \
                                        #endif \
-                                       #else \
-                                       #if (prog == ARG_BOTH) || (prog == ARG_SVQC) \
+                               #else \
+                                       #if (prog == ARG_DOUBLE) || (prog == ARG_TRIPLE) || (prog == ARG_SVQC) \
                                                case selected: { arg_slot[sel_num] = result; ++sel_num; break; } \
                                        #endif \
-                                       #endif
-                               NOTIF_ARGUMENT_LIST
-                               #undef ARG_CASE
-                               default: { backtrace(sprintf("Local_Notification_sprintf: Hit unknown token in selected string! '%s'\n", selected)); break; }
-                       }
+                               #endif
+                       NOTIF_ARGUMENT_LIST
+                       #undef ARG_CASE
+                       NOTIF_HIT_UNKNOWN(NOTIF_MAX_ARGS, "Local_Notification_sprintf")
                }
-               return sprintf(input, arg_slot[0], arg_slot[1], arg_slot[2], arg_slot[3], arg_slot[4], arg_slot[5], arg_slot[6]);
        }
-       
-       return "";
+       return sprintf(input, arg_slot[0], arg_slot[1], arg_slot[2], arg_slot[3], arg_slot[4], arg_slot[5], arg_slot[6]);
 }
 
 #ifdef CSQC
-void Local_Notification_HUD_Notify_Push(string icon, string hudargs, string s1, string s2)
+void Local_Notification_HUD_Notify_Push(string icon, string hudargs, string s1, string s2, string s3, string s4)
 {
-       string selected, remaining = hudargs;
-       float sel_num = 0;
+       string selected;
+       float sel_num;
        arg_slot[0] = ""; arg_slot[1] = "";
-       if(remaining != "")
+
+       for(sel_num = 0;(hudargs != "");)
        {
-               for(;remaining;)
+               selected = car(hudargs); hudargs = cdr(hudargs);
+               NOTIF_HIT_MAX(NOTIF_MAX_HUDARGS, "Local_Notification_HUD_Notify_Push")
+               switch(strtolower(selected))
                {
-                       selected = car(remaining); remaining = cdr(remaining);
-                       if(sel_num == 2) { backtrace("Local_Notification_HUD_Notify_Push: Hit maximum arguments!\n"); break; }
-                       switch(strtolower(selected))
-                       {
-                               #define ARG_CASE(selected,result) case selected: { arg_slot[sel_num] = result; ++sel_num; break; }
-                               ARG_CASE("s1", s1)
-                               ARG_CASE("s2", s2)
-                               #undef ARG_CASE
-                               default: { backtrace(sprintf("Local_Notification_HUD_Notify_Push: Hit unknown token in selected string! '%s'\n", selected)); break; }
-                       }
+                       #define ARG_CASE(prog,selected,result) \
+                               #if (prog == ARG_TRIPLE) \
+                                       case selected: { arg_slot[sel_num] = result; ++sel_num; break; } \
+                               #endif
+                       NOTIF_ARGUMENT_LIST
+                       #undef ARG_CASE
+                       NOTIF_HIT_UNKNOWN(NOTIF_MAX_HUDARGS, "Local_Notification_HUD_Notify_Push")
                }
        }
        HUD_Notify_Push(icon, arg_slot[0], arg_slot[1]);
@@ -185,10 +205,10 @@ void Local_Notification_HUD_Notify_Push(string icon, string hudargs, string s1,
 void Local_Notification(float net_type, float net_name, ...count)
 {
        // check supplied type and name for errors
+       string checkargs = "";
        #define CHECKARG_TYPENAME(type) case MSG_##type##: \
                { if(!net_name || (net_name > NOTIF_##type##_COUNT)) \
                { checkargs = sprintf("Improper name: %d!", net_name); } break; }
-       string checkargs = "";
        switch(net_type)
        {
                CHECKARG_TYPENAME(INFO)
@@ -201,40 +221,71 @@ void Local_Notification(float net_type, float net_name, ...count)
        if(checkargs != "") { backtrace(sprintf("Incorrect usage of Local_Notification: %s\n", checkargs)); return; }
 
        entity notif = Get_Notif_Ent(net_type, net_name);
-       if not(notif) { backtrace("Local_Notification: Could not find notification entity! (This wasn't caught by usage check?...)\n"); return; }
+       if not(notif) { backtrace("Local_Notification: Could not find notification entity!\n"); return; }
        if not(notif.nent_enabled) { print("Local_Notification: Entity was disabled...\n"); return; }
 
        if((notif.nent_stringcount + notif.nent_floatcount) > count)
-               { backtrace(sprintf(strcat("Not enough arguments for Local_Notification! stringcount(%d) + floatcount(%d) > count(%d)\n", 
-               "Check the notification definition and function call for accuracy...?\n"), notif.nent_stringcount, notif.nent_floatcount, count)); return; }
+       {
+               backtrace(sprintf(
+                       strcat(
+                               "Not enough arguments for Local_Notification! ",
+                               "stringcount(%d) + floatcount(%d) > count(%d)\n", 
+                               "Check the definition and function call for accuracy...?\n"
+                       ),
+                       notif.nent_stringcount, notif.nent_floatcount, count));
+               return;
+       }
        else if((notif.nent_stringcount + notif.nent_floatcount) < count)
-               { backtrace(sprintf(strcat("Too many arguments for Local_Notification! stringcount(%d) + floatcount(%d) < count(%d)\n",
-               "Check the notification definition and function call for accuracy...?\n"), notif.nent_stringcount, notif.nent_floatcount, count)); return; }
+       {
+               backtrace(sprintf(
+                       strcat(
+                               "Too many arguments for Local_Notification! ",
+                               "stringcount(%d) + floatcount(%d) < count(%d)\n",
+                               "Check the definition and function call for accuracy...?\n"
+                       ),
+                       notif.nent_stringcount, notif.nent_floatcount, count));
+               return;
+       }
 
        string s1 = ((0 < notif.nent_stringcount) ? ...(0, string) : "");
        string s2 = ((1 < notif.nent_stringcount) ? ...(1, string) : "");
        string s3 = ((2 < notif.nent_stringcount) ? ...(2, string) : "");
        string s4 = ((3 < notif.nent_stringcount) ? ...(3, string) : "");
-       float f1 = ((notif.nent_stringcount < count) ? ...(notif.nent_stringcount, float) : 0);
-       float f2 = (((notif.nent_stringcount + 1) < count) ? ...((notif.nent_stringcount + 1), float) : 0);
-       float f3 = (((notif.nent_stringcount + 2) < count) ? ...((notif.nent_stringcount + 2), float) : 0);
-       float f4 = (((notif.nent_stringcount + 3) < count) ? ...((notif.nent_stringcount + 3), float) : 0);
+       float f1 = ((0 < notif.nent_floatcount) ? ...((notif.nent_stringcount + 0), float) : 0);
+       float f2 = ((1 < notif.nent_floatcount) ? ...((notif.nent_stringcount + 1), float) : 0);
+       float f3 = ((2 < notif.nent_floatcount) ? ...((notif.nent_stringcount + 2), float) : 0);
+       float f4 = ((3 < notif.nent_floatcount) ? ...((notif.nent_stringcount + 3), float) : 0);
 
        #ifdef NOTIFICATIONS_DEBUG
-       dprint(sprintf("Local_Notification(%d, %s, %s, %s);\n",
-               net_type, notif.nent_name,
-               sprintf("'%s^7', '%s^7', '%s^7', '%s^7'", s1, s2, s3, s4),
-               sprintf("%d, %d, %d, %d", f1, f2, f3, f4)));
+       dprint(
+               sprintf("Local_Notification(%d, %s, %s, %s);\n",
+                       net_type,
+                       notif.nent_name,
+                       sprintf("'%s^7', '%s^7', '%s^7', '%s^7'", s1, s2, s3, s4),
+                       sprintf("%d, %d, %d, %d", f1, f2, f3, f4)
+               )
+       );
        #endif
        
        switch(net_type)
        {
                case MSG_INFO:
                {
-                       print(Local_Notification_sprintf(notif.nent_string, notif.nent_args, 
-                               s1, s2, s3, s4, f1, f2, f3, f4));
+                       print(
+                               Local_Notification_sprintf(
+                                       notif.nent_string,
+                                       notif.nent_args, 
+                                       s1, s2, s3, s4,
+                                       f1, f2, f3, f4)
+                       );
                        #ifdef CSQC 
-                       if(notif.nent_icon != "") { Local_Notification_HUD_Notify_Push(notif.nent_icon, notif.nent_hudargs, s1, s2); } 
+                       if(notif.nent_icon != "")
+                       {
+                               Local_Notification_HUD_Notify_Push(
+                                       notif.nent_icon,
+                                       notif.nent_hudargs,
+                                       s1, s2, s3, s4);
+                       } 
                        #endif 
                        break;
                }
@@ -242,9 +293,14 @@ void Local_Notification(float net_type, float net_name, ...count)
                #ifdef CSQC
                case MSG_CENTER:
                {
-                       centerprint_generic(notif.nent_cpid,
-                               Local_Notification_sprintf(notif.nent_string, notif.nent_args, 
-                               s1, s2, s3, s4, f1, f2, f3, f4), 0, 0);
+                       centerprint_generic(
+                               notif.nent_cpid,
+                               Local_Notification_sprintf(
+                                       notif.nent_string,
+                                       notif.nent_args, 
+                                       s1, s2, s3, s4,
+                                       f1, f2, f3, f4),
+                               0, 0);
                        break;
                }
                #endif
@@ -252,22 +308,28 @@ void Local_Notification(float net_type, float net_name, ...count)
                case MSG_WEAPON:
                case MSG_DEATH:
                {
-                       if(notif.nent_infoname)
-                       if(msg_info_notifs[notif.nent_infoname - 1].nent_enabled)
+                       if(notif.nent_msginfo)
+                       if(notif.nent_msginfo.nent_enabled)
                        {
-                               Local_Notification_Without_VarArgs(MSG_INFO, notif.nent_infoname, 
-                                       Get_Notif_Strnum(MSG_INFO, notif.nent_infoname), 
-                                       Get_Notif_Flnum(MSG_INFO, notif.nent_infoname), 
-                                       s1, s2, s3, s4, f1, f2, f3, f4);
+                               Local_Notification_WOVA(
+                                       MSG_INFO,
+                                       notif.nent_msginfo.nent_id, 
+                                       notif.nent_msginfo.nent_stringcount, 
+                                       notif.nent_msginfo.nent_floatcount, 
+                                       s1, s2, s3, s4,
+                                       f1, f2, f3, f4);
                        }
                        #ifdef CSQC
-                       if(notif.nent_centername)
-                       if(msg_center_notifs[notif.nent_centername - 1].nent_enabled)
+                       if(notif.nent_msgcenter)
+                       if(notif.nent_msgcenter.nent_enabled)
                        {
-                               Local_Notification_Without_VarArgs(MSG_CENTER, notif.nent_centername, 
-                                       Get_Notif_Strnum(MSG_CENTER, notif.nent_centername), 
-                                       Get_Notif_Flnum(MSG_CENTER, notif.nent_centername), 
-                                       s1, s2, s3, s4, f1, f2, f3, f4); 
+                               Local_Notification_WOVA(
+                                       MSG_CENTER,
+                                       notif.nent_msgcenter.nent_id, 
+                                       notif.nent_msgcenter.nent_stringcount, 
+                                       notif.nent_msgcenter.nent_floatcount, 
+                                       s1, s2, s3, s4,
+                                       f1, f2, f3, f4); 
                        }
                        #endif
                        break;
@@ -275,15 +337,17 @@ void Local_Notification(float net_type, float net_name, ...count)
        }
 }
 
-void Local_Notification_Without_VarArgs(float net_type, float net_name,
+// WOVA = Without Variable Arguments 
+void Local_Notification_WOVA(float net_type, float net_name,
        float stringcount, float floatcount,
        string s1, string s2, string s3, string s4,
        float f1, float f2, float f3, float f4)
 {
-       #define VARITEM(stringc,floatc,args) if((stringcount == stringc) && (floatcount == floatc)) { Local_Notification(net_type, net_name, args); return; }
+       #define VARITEM(stringc,floatc,args) \
+               if((stringcount == stringc) && (floatcount == floatc)) \
+                       { Local_Notification(net_type, net_name, args); return; }
        EIGHT_VARS_TO_VARARGS_VARLIST
        #undef VARITEM
-
        Local_Notification(net_type, net_name); // some notifications don't have any arguments at all
 }
 
@@ -300,7 +364,6 @@ void Read_Notification(float is_new)
 
        entity notif = Get_Notif_Ent(net_type, net_name);
        if not(notif) { print("Read_Notification: Could not find notification entity!\n"); return; }
-       if not(notif.nent_enabled) { print("Read_Notification: Entity was disabled but networked anyway?!?...\n"); return; }
 
        string s1 = ((0 < notif.nent_stringcount) ? ReadString() : "");
        string s2 = ((1 < notif.nent_stringcount) ? ReadString() : "");
@@ -315,30 +378,102 @@ void Read_Notification(float is_new)
        dprint(sprintf("Read_Notification(%d) at %f: net_name = %s.\n", is_new, time, notif.nent_name));
        #endif
        
-       if(is_new) { Local_Notification_Without_VarArgs(net_type, net_name, notif.nent_stringcount, notif.nent_floatcount, s1, s2, s3, s4, f1, f2, f3, f4); }
+       if(is_new)
+       {
+               Local_Notification_WOVA(
+                       net_type, net_name,
+                       notif.nent_stringcount,
+                       notif.nent_floatcount,
+                       s1, s2, s3, s4,
+                       f1, f2, f3, f4);
+       }
 }
 #endif
 
 #ifdef SVQC
-void Notification_Remove()
+void Net_Notification_Remove()
 {
        float i;
        for(i = 0; i < 4; ++i) { if(self.nent_strings[i]) { strunzone(self.nent_strings[i]); } }
        remove(self);
 }
 
-float Write_Notification(entity client, float sf)
+float Net_Write_Notification(entity client, float sf)
 {
        float i, send = FALSE;
        
        switch(self.nent_broadcast)
        {
-               case NOTIF_ONE: { if((client == self.nent_client) || (client.classname == STR_SPECTATOR && client.enemy == self.nent_client)) { send = TRUE; } break; }
-               case NOTIF_ONE_ONLY: { if(client == self.nent_client) { send = TRUE; } break; }
-               case NOTIF_TEAM: { if((client.team == self.nent_client.team) || (client.classname == STR_SPECTATOR && client.enemy.team == self.nent_client.team)) { send = TRUE; } break; }
-               case NOTIF_TEAM_EXCEPT: { if(((client != self.nent_client) && (client.team == self.nent_client.team) && !(client.classname == STR_SPECTATOR && client.enemy == self.nent_client))) { send = TRUE; } break; }
-               case NOTIF_ANY: { send = TRUE; break; }
-               case NOTIF_ANY_EXCEPT: { if((client != self.nent_client) && !(client.classname == STR_SPECTATOR && client.enemy == self.nent_client)) { send = TRUE; } break; }
+               case NOTIF_ONE: // send to one client and their spectator
+               {
+                       if(
+                               (client == self.nent_client)
+                               ||
+                               (
+                                       (client.classname == STR_SPECTATOR)
+                                       &&
+                                       (client.enemy == self.nent_client)
+                               )
+                       ) { send = TRUE; }
+                       break;
+               }
+               case NOTIF_ONE_ONLY: // send ONLY to one client
+               {
+                       if(client == self.nent_client) { send = TRUE; }
+                       break;
+               }
+               case NOTIF_TEAM: // send only to X team and their spectators
+               {
+                       if(
+                               (client.team == self.nent_client.team)
+                               ||
+                               (
+                                       (client.classname == STR_SPECTATOR)
+                                       &&
+                                       (client.enemy.team == self.nent_client.team)
+                               )
+                       ) { send = TRUE; }
+                       break;
+               }
+               case NOTIF_TEAM_EXCEPT: // send only to X team and their spectators, except for Y person and their spectators
+               {
+                       if(
+                               (client != self.nent_client)
+                               &&
+                               (
+                                       (client.team == self.nent_client.team)
+                                       ||
+                                       (
+                                               (client.classname == STR_SPECTATOR)
+                                               &&
+                                               (
+                                                       (client.enemy != self.nent_client)
+                                                       &&
+                                                       (client.enemy.team == self.nent_client.team)
+                                               )
+                                       )
+                               )
+                       ) { send = TRUE; }
+                       break;
+               }
+               case NOTIF_ANY: // send to everyone
+               {
+                       send = TRUE;
+                       break;
+               }
+               case NOTIF_ANY_EXCEPT: // send to everyone except X person and their spectators
+               {
+                       if(
+                               (client != self.nent_client)
+                               &&
+                               !(
+                                       (client.classname == STR_SPECTATOR)
+                                       &&
+                                       (client.enemy == self.nent_client)
+                               )
+                       ) { send = TRUE; }
+                       break;
+               }
                default: { send = FALSE; break; }
        }
 
@@ -358,10 +493,10 @@ void Send_Notification(float broadcast, entity client,
        float net_type, float net_name, ...count)
 {
        // check supplied broadcast, target, type, and name for errors
+       string checkargs = "";
        #define CHECKARG_TYPENAME(type) case MSG_##type##: \
                { if(!net_name || (net_name > NOTIF_##type##_COUNT)) \
                { checkargs = sprintf("Improper name: %d!", net_name); } break; }
-       string checkargs = "";
        switch(net_type)
        {
                CHECKARG_TYPENAME(INFO)
@@ -375,39 +510,81 @@ void Send_Notification(float broadcast, entity client,
        switch(broadcast)
        {
                case NOTIF_ONE:
-               case NOTIF_ONE_ONLY: { if(clienttype(client) == CLIENTTYPE_NOTACLIENT) { checkargs = sprintf("%sNo client provided!", checkargs); } break; }
-               case NOTIF_ANY_EXCEPT: { if(clienttype(client) == CLIENTTYPE_NOTACLIENT) { checkargs = sprintf("%sException can't be a non-client!", checkargs); } break; }
-               case NOTIF_ANY: { if(client) { checkargs = sprintf("%sEntity provided when world was required!", checkargs); } break; }
+               case NOTIF_ONE_ONLY:
+               {
+                       if(IS_NOT_A_CLIENT(client))
+                               { checkargs = sprintf("%sNo client provided!", checkargs); }
+                       break;
+               }
+               
+               case NOTIF_ANY_EXCEPT:
+               {
+                       if(IS_NOT_A_CLIENT(client))
+                               { checkargs = sprintf("%sException can't be a non-client!", checkargs); }
+                       break;
+               }
+               
+               case NOTIF_ANY:
+               {
+                       if(client)
+                               { checkargs = sprintf("%sEntity provided when world was required!", checkargs); }
+                       break;
+               }
+               
                case NOTIF_TEAM:
                case NOTIF_TEAM_EXCEPT:
                {
                        if not(teamplay) { checkargs = sprintf("%sTeamplay not active!", checkargs); }
-                       else if(clienttype(client) == CLIENTTYPE_NOTACLIENT)
+                       else if(IS_NOT_A_CLIENT(client))
                        {
                                if(broadcast == NOTIF_TEAM) { checkargs = sprintf("%sNo client provided!", checkargs); }
                                else { checkargs = sprintf("%sException can't be a non-client!", checkargs); }
                        }
                        break;
                }
+               
                default: { checkargs = sprintf("%sImproper broadcast: %d!", checkargs, broadcast); break; }
        }
        if(checkargs != "") { backtrace(sprintf("Incorrect usage of Send_Notification: %s\n", checkargs)); return; }
 
        // retreive counts for the arguments of this notification
        entity notif = Get_Notif_Ent(net_type, net_name);
-       if not(notif) { backtrace("Send_Notification: Could not find notification entity! (This wasn't caught by usage check?...)\n"); return; }
-       if not(notif.nent_enabled) { print("Send_Notification: Entity was disabled...\n"); return; }
+       if not(notif) { backtrace("Send_Notification: Could not find notification entity!\n"); return; }
 
        if((notif.nent_stringcount + notif.nent_floatcount) > count)
-               { backtrace(sprintf(strcat("Not enough arguments for Send_Notification! stringcount(%d) + floatcount(%d) > count(%d)\n", 
-               "Check the notification definition and function call for accuracy...?\n"), notif.nent_stringcount, notif.nent_floatcount, count)); return; }
+       {
+               backtrace(sprintf(
+                       strcat(
+                               "Not enough arguments for Send_Notification! ",
+                               "stringcount(%d) + floatcount(%d) > count(%d)\n", 
+                               "Check the definition and function call for accuracy...?\n"
+                       ),
+                       notif.nent_stringcount, notif.nent_floatcount, count));
+               return;
+       }
        else if((notif.nent_stringcount + notif.nent_floatcount) < count)
-               { backtrace(sprintf(strcat("Too many arguments for Send_Notification! stringcount(%d) + floatcount(%d) < count(%d)\n",
-               "Check the notification definition and function call for accuracy...?\n"), notif.nent_stringcount, notif.nent_floatcount, count)); return; }
-
+       {
+               backtrace(sprintf(
+                       strcat(
+                               "Too many arguments for Send_Notification! ",
+                               "stringcount(%d) + floatcount(%d) < count(%d)\n",
+                               "Check the definition and function call for accuracy...?\n"
+                       ),
+                       notif.nent_stringcount, notif.nent_floatcount, count));
+               return;
+       }
+       
        #ifdef NOTIFICATIONS_DEBUG
-       dprint(sprintf("Send_Notification(%d, %d, %s, stringcount: %d, floatcount: %d, varargs: %d);\n",
-               broadcast, net_type, notif.nent_name, notif.nent_stringcount, notif.nent_floatcount, count));
+       dprint(
+               sprintf("Send_Notification(%d, %d, %s, stringcount: %d, floatcount: %d, varargs: %d);\n",
+                       broadcast,
+                       net_type,
+                       notif.nent_name,
+                       notif.nent_stringcount,
+                       notif.nent_floatcount,
+                       count
+               )
+       );
        #endif
 
        entity net_notif = spawn();
@@ -422,39 +599,37 @@ void Send_Notification(float broadcast, entity client,
        for(i = 0; i < net_notif.nent_stringcount; ++i) { net_notif.nent_strings[i] = strzone(...(i, string)); }
        for(i = 0; i < net_notif.nent_floatcount; ++i) { net_notif.nent_floats[i] = ...((net_notif.nent_stringcount + i), float); }
        
-       net_notif.think = Notification_Remove;
+       net_notif.think = Net_Notification_Remove;
        net_notif.nextthink = (time + 0.5); 
 
-       Net_LinkEntity(net_notif, FALSE, 0, Write_Notification);
+       Net_LinkEntity(net_notif, FALSE, 0, Net_Write_Notification);
 
        if((!server_is_local) && (broadcast == NOTIF_ANY || broadcast == NOTIF_ANY_EXCEPT) && (net_type != MSG_CENTER))
-               { Local_Notification_Without_VarArgs(net_type, net_name, notif.nent_stringcount, notif.nent_floatcount,
-                       IFSTR(0), IFSTR(1), IFSTR(2), IFSTR(3), IFFL(0), IFFL(1), IFFL(2), IFFL(3)); }
+       {
+               Local_Notification_WOVA(
+                       net_type, net_name,
+                       notif.nent_stringcount,
+                       notif.nent_floatcount,
+                       IFSTR(0), IFSTR(1), IFSTR(2), IFSTR(3),
+                       IFFL(0), IFFL(1), IFFL(2), IFFL(3));
+       }
 }
 
-void Send_Notification_Without_VarArgs(float broadcast, entity client,
+// WOVA = Without Variable Arguments 
+void Send_Notification_WOVA(float broadcast, entity client,
        float net_type, float net_name,
-       float stringcount, float floatcount,
        string s1, string s2, string s3, string s4,
        float f1, float f2, float f3, float f4)
-{              
-       #define VARITEM(stringc,floatc,args) if((stringcount == stringc) && (floatcount == floatc)) { Send_Notification(broadcast, client, net_type, net_name, args); return; }
+{
+       entity notif = Get_Notif_Ent(net_type, net_name);
+       #define VARITEM(stringc,floatc,args) \
+               if((notif.nent_stringcount == stringc) && (notif.nent_floatcount == floatc)) \
+                       { Send_Notification(broadcast, client, net_type, net_name, args); return; }
        EIGHT_VARS_TO_VARARGS_VARLIST
        #undef VARITEM
-
        Send_Notification(broadcast, client, net_type, net_name); // some notifications don't have any arguments at all
 }
 
-void Send_Notification_Legacy_Wrapper(float broadcast, entity client,
-       float net_type, float net_name,
-       string s1, string s2,
-       float f1, float f2, float f3)
-{
-       float stringcount = Get_Notif_Strnum(net_type, net_name);
-       float floatcount = Get_Notif_Flnum(net_type, net_name);
-       Send_Notification_Without_VarArgs(broadcast, client, net_type, net_name, stringcount, floatcount, s1, s2, "", "", f1, f2, f3, 0);
-}
-
 
 // =============================
 //  LEGACY NOTIFICATION SYSTEMS
@@ -478,9 +653,4 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration,
                });
        }
 }
-void Send_CSQC_Centerprint_Generic_Expire(entity e, float id)
-{
-       Send_CSQC_Centerprint_Generic(e, id, "", 1, 0);
-}
 #endif // ifdef SVQC
-#endif // ifndef MENUQC