]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/notifications.qc
Slight cleanup
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / notifications.qc
index fdd93459ab8dac2a34fc4b6aead93d73581372a8..1055fc80732c615642c8350d5d5cafcd8cdd199a 100644 (file)
 // ================================================
 
 #ifndef MENUQC
-// get the actual name of a notification and return it as a string
-string Get_Field_Value(float field, float net_type, float net_name)
+string arg_slot[8];
+string Fill_Notif_Args(string args, string input,
+       string s1, string s2, string s3, string s4,
+       float f1, float f2, float f3, float f4)
 {
-       #define GET_FIELD_VALUE_OUTPUT(field,name,strnum,flnum) switch(field) { \
-                       case F_NAME: { return VAR_TO_TEXT(name); } \
-                       case F_STRNUM: { return ftos(strnum); } \
-                       case F_FLNUM: { return ftos(flnum); } }
-
-       #define CLPSE_GETVALUE(name,type,field) \
-               #if name != NO_MSG \
-                       stof(Get_Field_Value(field, type, name)) \
-               #else \
-                       0 \
-               #endif
+       dprint(sprintf("Fill_Notif_Args('%s', '%s', %s, %s, %s, %s, %d, %d, %d, %d);\n",
+               args, input, s1, s2, s3, s4, f1, f2, f3, f4));
 
-       switch(net_type)
+       string selected, remaining = args;
+       float sel_num = 0;
+
+       #ifdef CSQC
+       string tmp_s;
+       #endif
+       
+       if((remaining != "") && (input != ""))
        {
-               case MSG_INFO:
-               {
-                       #define MSG_INFO_NOTIF(name,strnum,flnum,args,hudargs,icon,normal,gentle) case name: { GET_FIELD_VALUE_OUTPUT(field,name,strnum,flnum) }
-                               
-                       NOTIF_SWITCH_LIST(MSG_INFO, net_name, return "")
-                       
-                       #undef MSG_INFO_NOTIF
-                       break;
-               }
-               case MSG_CENTER:
+               for(;remaining;)
                {
-                       #define MSG_CENTER_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) case name: { GET_FIELD_VALUE_OUTPUT(field,name,strnum,flnum) }
+                       selected = car(remaining); remaining = cdr(remaining);
 
-                       NOTIF_SWITCH_LIST(MSG_CENTER, net_name, return "")
-                       
-                       #undef MSG_CENTER_NOTIF
-                       break;
-               }
-               case MSG_WEAPON:
-               {
-                       #define MSG_WEAPON_NOTIF(name,infoname,centername) case name: { GET_FIELD_VALUE_OUTPUT(field,name, \
-                               max(CLPSE_GETVALUE(infoname, MSG_INFO, F_STRNUM), CLPSE_GETVALUE(centername, MSG_CENTER, F_STRNUM)), \
-                               max(CLPSE_GETVALUE(infoname, MSG_INFO, F_FLNUM), CLPSE_GETVALUE(centername, MSG_CENTER, F_FLNUM))) }
-                               
-                       NOTIF_SWITCH_LIST(MSG_WEAPON, net_name, return "")
-                       
-                       #undef MSG_WEAPON_NOTIF
-                       break;
-               }
-               case MSG_DEATH:
-               {
-                       #define MSG_DEATH_NOTIF(name,infoname,centername) case name: { GET_FIELD_VALUE_OUTPUT(field,name, \
-                               max(CLPSE_GETVALUE(infoname, MSG_INFO, F_STRNUM), CLPSE_GETVALUE(centername, MSG_CENTER, F_STRNUM)), \
-                               max(CLPSE_GETVALUE(infoname, MSG_INFO, F_FLNUM), CLPSE_GETVALUE(centername, MSG_CENTER, F_FLNUM))) }
+                       switch(strtolower(selected))
+                       {
+                               #define ADD_ARG_CASE(selected,result) case selected: { arg_slot[sel_num] = result; ++sel_num; break; }
                                
-                       NOTIF_SWITCH_LIST(MSG_DEATH, net_name, return "")
-                       
-                       #undef MSG_DEATH_NOTIF
-                       break;
+                               ADD_ARG_CASE("s1", s1)
+                               ADD_ARG_CASE("s2", s2)
+                               ADD_ARG_CASE("s3", s3)
+                               ADD_ARG_CASE("s4", s4)
+                               ADD_ARG_CASE("f1", ftos(f1))
+                               ADD_ARG_CASE("f2", ftos(f2))
+                               ADD_ARG_CASE("f3", ftos(f3))
+                               ADD_ARG_CASE("f4", ftos(f4))
+
+                               #ifdef CSQC // CSQC replacements
+                               ADD_ARG_CASE("pass_key",                ((((tmp_s = getcommandkey("pass", "+use")) != "pass") && !(strstrofs(tmp_s, "not bound", 0) >= 0)) ? sprintf(CCR(_(" ^F1(Press %s)")), tmp_s) : ""))
+                               ADD_ARG_CASE("frag_ping",               ((f2 != BOT_PING) ? sprintf(CCR(_("\n(Ping ^2%d^BG)")), f2) : ""))
+                               ADD_ARG_CASE("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) : "")))
+                               //ADD_ARG_CASE("frag_pos",              ((Should_Print_Score_Pos(f1)) ? sprintf("\n^BG%s", Read_Score_Pos(f1)) : ""))
+                               ADD_ARG_CASE("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) : ""))
+                               ADD_ARG_CASE("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) : ""))
+                               ADD_ARG_CASE("spree_end",               ((f1 >= 3) ? sprintf(normal_or_gentle(_(", ending their %d frag spree"), _(", ending their %d score spree")), f1) : ""))
+                               ADD_ARG_CASE("spree_lost",              ((f1 >= 3) ? sprintf(normal_or_gentle(_(", losing their %d frag spree"), _(", losing their %d score spree")), f1) : ""))
+                               ADD_ARG_CASE("death_team",              Team_ColoredFullName(f1 - 1))
+                               ADD_ARG_CASE("weapon_name",     ftos(f1)) // weaponorder[f1].netname
+
+                               #else // SVQC replacements
+                               ADD_ARG_CASE("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) : ""))
+                               ADD_ARG_CASE("spree_end",               ((f1 >= 3) ? sprintf(normal_or_gentle(_(", ending their %d frag spree"), _(", ending their %d score spree")), f1) : ""))
+                               ADD_ARG_CASE("spree_lost",              ((f1 >= 3) ? sprintf(normal_or_gentle(_(", losing their %d frag spree"), _(", losing their %d score spree")), f1) : ""))
+                               ADD_ARG_CASE("death_team",              Team_ColoredFullName(f1))
+                               ADD_ARG_CASE("weapon_name",             ftos(f1)) // weaponorder[f1].netname
+                               #endif
+
+                               #undef ADD_ARG_CASE
+                               default: { print("Hit unknown token in selected string! '", selected, "'\n"); break; }
+                       }
+                       if(sel_num == 7) { print("Hit maximum arguments!\n"); break; }
                }
+
+               return sprintf(input, arg_slot[0], arg_slot[1], arg_slot[2], arg_slot[3], arg_slot[4], arg_slot[5], arg_slot[6], arg_slot[7]);
        }
 
-       #undef GET_FIELD_VALUE_OUTPUT
-       #undef CLPSE_GETVALUE
        return "";
 }
+
+entity Get_Notif_Ent(float net_type, float net_name)
+{
+       switch(net_type)
+       {
+               case MSG_INFO: return msg_info_notifs[net_name - 1];
+               case MSG_CENTER: return msg_center_notifs[net_name - 1];
+               case MSG_WEAPON: return msg_weapon_notifs[net_name - 1];
+               case MSG_DEATH: return msg_death_notifs[net_name - 1];
+       }
+       backtrace(sprintf("Get_Notif_Ent(%d, %d): Improper net type!\n", net_type, 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
 
 
@@ -77,25 +132,36 @@ string Get_Field_Value(float field, 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)); } }
+
+       #ifndef MENUQC
        string notif_msg;
+       float i;
+       entity e;
 
-       #define NOTIF_WRITE(type,name,text) 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 MSG_INFO_NOTIF(name,strnum,flnum,args,hudargs,icon,normal,gentle) { ++MSG_INFO_NOTIFS; NOTIF_WRITE("MSG_INFO", VAR_TO_TEXT(name), normal) }
-       #define MSG_CENTER_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) { ++MSG_CENTER_NOTIFS; NOTIF_WRITE("MSG_CENTER", VAR_TO_TEXT(name), normal) }
-       #define MSG_WEAPON_NOTIF(name,infoname,centername) { ++MSG_WEAPON_NOTIFS; NOTIF_WRITE("MSG_WEAPON", VAR_TO_TEXT(name),sprintf("infoname: %s, centername: %s", VAR_TO_TEXT(infoname), VAR_TO_TEXT(centername))) }
-       #define MSG_DEATH_NOTIF(name,infoname,centername) { ++MSG_DEATH_NOTIFS; NOTIF_WRITE("MSG_DEATH", VAR_TO_TEXT(name), sprintf("infoname: %s, centername: %s", VAR_TO_TEXT(infoname), VAR_TO_TEXT(centername))) }
-       MSG_INFO_NOTIFICATIONS
-       MSG_CENTER_NOTIFICATIONS
-       MSG_WEAPON_NOTIFICATIONS
-       MSG_DEATH_NOTIFICATIONS
-       #undef NOTIF_WRITE
-       #undef MSG_INFO_NOTIF
-       #undef MSG_CENTER_NOTIF
-       #undef MSG_WEAPON_NOTIF
-       #undef MSG_DEATH_NOTIF
+       for(i = 0; i < NOTIF_INFO_COUNT; ++i) { e = Get_Notif_Ent(MSG_INFO, i); NOTIF_WRITE(MSG_INFO, e.nent_name, e.nent_normal); }
+       for(i = 0; i < NOTIF_CENTER_COUNT; ++i) { e = Get_Notif_Ent(MSG_CENTER, i); NOTIF_WRITE(MSG_CENTER, e.nent_name, e.nent_normal); }
+       
+       for(i = 0; 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) { 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
+
+       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));
        
-       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));
        return;
+       #undef NOTIF_WRITE
 }
 
 #ifndef MENUQC
@@ -125,117 +191,149 @@ void HUD_Notify_Push(string icon, string attacker, string victim)
 
 void Local_Notification(float net_type, float net_name, ...count)
 {
-       if(net_type && net_name)
+       // check supplied type and name for errors
+       #ifdef NOTIFICATIONS_DEBUG
        {
-               float stringcount = stof(Get_Field_Value(F_STRNUM, net_type, net_name));
-               float floatcount = stof(Get_Field_Value(F_FLNUM, net_type, net_name));
-
-               string s1 = ((0 < stringcount) ? ...(0, string) : NO_STR_ARG);
-               string s2 = ((1 < stringcount) ? ...(1, string) : NO_STR_ARG);
-               string s3 = ((2 < stringcount) ? ...(2, string) : NO_STR_ARG);
-               string s4 = ((3 < stringcount) ? ...(3, string) : NO_STR_ARG);
-               float f1 = ((stringcount < count) ? ...(stringcount, float) : NO_FL_ARG);
-               float f2 = (((stringcount + 1) < count) ? ...((stringcount + 1), float) : NO_FL_ARG);
-               float f3 = (((stringcount + 2) < count) ? ...((stringcount + 2), float) : NO_FL_ARG);
-               float f4 = (((stringcount + 3) < count) ? ...((stringcount + 3), float) : NO_FL_ARG);
-               
-               dprint("Local_Notification(", ftos(net_type), ", ", Get_Field_Value(F_NAME, net_type, net_name), strcat(", ", s1, ", ", s2, ", ", s3, ", ", s4, ", "), strcat(ftos(f1), strcat(", ", ftos(f2), ", ", ftos(f3), ", ", ftos(f4), ");\n")));
-               dprint("  ^--: stringcount: ", ftos(stringcount), ", floatcount: ", ftos(floatcount), ".\n");
+               #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)
+                       CHECKARG_TYPENAME(CENTER)
+                       CHECKARG_TYPENAME(WEAPON)
+                       CHECKARG_TYPENAME(DEATH)
+                       
+                       default: { checkargs = sprintf("Improper type: %d!", checkargs, net_type); break; }
+               }
+               #undef CHECKARG_TYPENAME
 
-               if((stringcount + floatcount) > count) { backtrace(strcat("Not enough arguments for Local_Notification! ", strcat("stringcount(", ftos(stringcount), ") + floatcount(", ftos(floatcount), ")"), " > count(", ftos(count), ").\nCheck the notification definition and the function call for accuracy...?\n")); return; }
-               else if((stringcount + floatcount) < count) { backtrace(strcat("Too many arguments for Local_Notification! ", strcat("stringcount(", ftos(stringcount), ") + floatcount(", ftos(floatcount), ")"), " < count(", ftos(count), ").\nCheck the notification definition and the function call for accuracy...?\n")); return; }
+               if(checkargs != "") { backtrace(sprintf("Incorrect usage of Local_Notification: %s\n", checkargs)); return; }
+       }
+       #endif
+       
+       float stringcount = Get_Notif_Strnum(net_type, net_name);
+       float floatcount = Get_Notif_Flnum(net_type, net_name);
+
+       string s1 = ((0 < stringcount) ? ...(0, string) : NO_STR_ARG);
+       string s2 = ((1 < stringcount) ? ...(1, string) : NO_STR_ARG);
+       string s3 = ((2 < stringcount) ? ...(2, string) : NO_STR_ARG);
+       string s4 = ((3 < stringcount) ? ...(3, string) : NO_STR_ARG);
+       float f1 = ((stringcount < count) ? ...(stringcount, float) : NO_FL_ARG);
+       float f2 = (((stringcount + 1) < count) ? ...((stringcount + 1), float) : NO_FL_ARG);
+       float f3 = (((stringcount + 2) < count) ? ...((stringcount + 2), float) : NO_FL_ARG);
+       float f4 = (((stringcount + 3) < count) ? ...((stringcount + 3), float) : NO_FL_ARG);
+
+       #ifdef NOTIFICATIONS_DEBUG
+       {
+               dprint(sprintf("Local_Notification(%d, %s, %s, %s, %s, %s, %d, %d, %d, %d);\n",
+                       net_type, Get_Notif_Name(net_type, net_name),
+                       s1, s2, s3, s4, f1, f2, f3, f4));
+
+               if((stringcount + floatcount) > count)
+                       { backtrace(sprintf("Not enough arguments for Local_Notification! stringcount(%d) + floatcount(%d) > count(%d) \
+                       \nCheck the notification definition and function call for accuracy...?\n", stringcount, floatcount, count)); return; }
+               else if((stringcount + floatcount) < count)
+                       { backtrace(sprintf("Too many arguments for Local_Notification! stringcount(%d) + floatcount(%d) < count(%d) \
+                       \nCheck the notification definition and function call for accuracy...?\n", stringcount, floatcount, count)); return; }
+       }
+       #endif
+       
 
-               switch(net_type)
+       switch(net_type)
+       {
+               case MSG_INFO:
                {
-                       case MSG_INFO:
-                       {
-                               #define MSG_INFO_NOTIF(name,strnum,flnum,args,hudargs,icon,normal,gentle) \
-                                       case name: { CHECK_AUTOCVAR(name) \
-                                       { \
-                                               print(sprintf(CCR(normal_or_gentle(normal, gentle)), args)); \
-                                               #ifdef CSQC \
-                                                       if(icon != "") { HUD_Notify_Push(icon, hudargs); } \
-                                               #endif \
-                                       } return; }
-                                       
-                               NOTIF_SWITCH_LIST(MSG_INFO, net_name, return)
+                       #define MSG_INFO_NOTIF(name,strnum,flnum,args,hudargs,icon,normal,gentle) \
+                               case name: { CHECK_AUTOCVAR(name) \
+                               { \
+                                       print(sprintf(CCR(normal_or_gentle(normal, gentle)), args)); \
+                                       #ifdef CSQC \
+                                               if(icon != "") { HUD_Notify_Push(icon, hudargs); } \
+                                       #endif \
+                               } return; }
                                
-                               #undef MSG_INFO_NOTIF
-                               break;
-                       }
-                       #ifdef CSQC
-                       case MSG_CENTER:
-                       {
-                               #define MSG_CENTER_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) \
-                                       case name: { CHECK_AUTOCVAR(name) \
-                                       { \
-                                               centerprint_generic(HANDLE_CPID(cpid), sprintf(CCR(normal_or_gentle(normal, gentle)), args), durcnt); \
-                                       } return; }
+                       NOTIF_SWITCH_LIST(MSG_INFO, net_name, return)
+                       
+                       #undef MSG_INFO_NOTIF
+                       break;
+               }
+               #ifdef CSQC
+               case MSG_CENTER:
+               {
+                       #define MSG_CENTER_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) \
+                               case name: { CHECK_AUTOCVAR(name) \
+                               { \
+                                       centerprint_generic(HANDLE_CPID(cpid), sprintf(CCR(normal_or_gentle(normal, gentle)), args), durcnt); \
+                               } return; }
 
-                               NOTIF_SWITCH_LIST(MSG_CENTER, net_name, return)
-                               
-                               #undef MSG_CENTER_NOTIF
-                               break;
-                       }
-                       #endif
-                       case MSG_WEAPON:
-                       {
-                               #define MSG_WEAPON_NOTIF(name,infoname,centername) \
-                                       case name: { CHECK_AUTOCVAR(name) \
-                                       { \
-                                               #if infoname != NO_MSG \
-                                                       Local_Notification_Without_VarArgs(MSG_INFO, infoname, \
-                                                               stof(Get_Field_Value(F_STRNUM, MSG_INFO, infoname)), \
-                                                               stof(Get_Field_Value(F_FLNUM, MSG_INFO, infoname)), \
+                       NOTIF_SWITCH_LIST(MSG_CENTER, net_name, return)
+                       
+                       #undef MSG_CENTER_NOTIF
+                       break;
+               }
+               #endif
+               case MSG_WEAPON:
+               {
+                       #define MSG_WEAPON_NOTIF(name,infoname,centername) \
+                               case name: { CHECK_AUTOCVAR(name) \
+                               { \
+                                       #if infoname != NO_MSG \
+                                               Local_Notification_Without_VarArgs(MSG_INFO, infoname, \
+                                                       Get_Notif_Strnum(MSG_INFO, infoname), \
+                                                       Get_Notif_Flnum(MSG_INFO, infoname), \
+                                                       s1, s2, s3, s4, f1, f2, f3, f4); \
+                                       #endif \
+                                       #ifdef CSQC \
+                                               #if centername != NO_MSG \
+                                                       Local_Notification_Without_VarArgs(MSG_CENTER, centername, \
+                                                               Get_Notif_Strnum(MSG_CENTER, centername), \
+                                                               Get_Notif_Flnum(MSG_CENTER, centername), \
                                                                s1, s2, s3, s4, f1, f2, f3, f4); \
                                                #endif \
-                                               #ifdef CSQC \
-                                                       #if centername != NO_MSG \
-                                                               Local_Notification_Without_VarArgs(MSG_CENTER, centername, \
-                                                                       stof(Get_Field_Value(F_STRNUM, MSG_CENTER, centername)), \
-                                                                       stof(Get_Field_Value(F_FLNUM, MSG_CENTER, centername)), \
-                                                                       s1, s2, s3, s4, f1, f2, f3, f4); \
-                                                       #endif \
-                                               #endif \
-                                       } return; }
+                                       #endif \
+                               } return; }
 
-                               NOTIF_SWITCH_LIST(MSG_WEAPON, net_name, return)
-                               
-                               #undef MSG_WEAPON_NOTIF
-                               break;
-                       }
-                       case MSG_DEATH:
-                       {
-                               #define MSG_DEATH_NOTIF(name,infoname,centername) \
-                                       case name: { CHECK_AUTOCVAR(name) \
-                                       { \
-                                               #if infoname != NO_MSG \
-                                                       Local_Notification_Without_VarArgs(MSG_INFO, infoname, \
-                                                               stof(Get_Field_Value(F_STRNUM, MSG_INFO, infoname)), \
-                                                               stof(Get_Field_Value(F_FLNUM, MSG_INFO, infoname)), \
+                       NOTIF_SWITCH_LIST(MSG_WEAPON, net_name, return)
+                       
+                       #undef MSG_WEAPON_NOTIF
+                       break;
+               }
+               case MSG_DEATH:
+               {
+                       #define MSG_DEATH_NOTIF(name,infoname,centername) \
+                               case name: { CHECK_AUTOCVAR(name) \
+                               { \
+                                       #if infoname != NO_MSG \
+                                               Local_Notification_Without_VarArgs(MSG_INFO, infoname, \
+                                                       Get_Notif_Strnum(MSG_INFO, infoname), \
+                                                       Get_Notif_Flnum(MSG_INFO, infoname), \
+                                                       s1, s2, s3, s4, f1, f2, f3, f4); \
+                                       #endif \
+                                       #ifdef CSQC \
+                                               #if centername != NO_MSG \
+                                                       Local_Notification_Without_VarArgs(MSG_CENTER, centername, \
+                                                               Get_Notif_Strnum(MSG_CENTER, centername), \
+                                                               Get_Notif_Flnum(MSG_CENTER, centername), \
                                                                s1, s2, s3, s4, f1, f2, f3, f4); \
                                                #endif \
-                                               #ifdef CSQC \
-                                                       #if centername != NO_MSG \
-                                                               Local_Notification_Without_VarArgs(MSG_CENTER, centername, \
-                                                                       stof(Get_Field_Value(F_STRNUM, MSG_CENTER, centername)), \
-                                                                       stof(Get_Field_Value(F_FLNUM, MSG_CENTER, centername)), \
-                                                                       s1, s2, s3, s4, f1, f2, f3, f4); \
-                                                       #endif \
-                                               #endif \
-                                       } return; } 
+                                       #endif \
+                               } return; } 
 
-                               NOTIF_SWITCH_LIST(MSG_DEATH, net_name, return)
-                               
-                               #undef MSG_DEATH_NOTIF
-                               break;
-                       }
+                       NOTIF_SWITCH_LIST(MSG_DEATH, net_name, return)
+                       
+                       #undef MSG_DEATH_NOTIF
+                       break;
                }
        }
-       else { backtrace("Incorrect usage of Local_Notification!\n"); }
 }
 
-void Local_Notification_Without_VarArgs(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)
+void Local_Notification_Without_VarArgs(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; }
        EIGHT_VARS_TO_VARARGS_VARLIST
@@ -255,8 +353,8 @@ void Read_Notification(float is_new)
        float net_type = ReadByte();
        float net_name = ReadShort();
 
-       float stringcount = stof(Get_Field_Value(F_STRNUM, net_type, net_name));
-       float floatcount = stof(Get_Field_Value(F_FLNUM, net_type, net_name));
+       float stringcount = Get_Notif_Strnum(net_type, net_name);
+       float floatcount = Get_Notif_Flnum(net_type, net_name);
 
        string s1 = ((stringcount >= 1) ? ReadString() : NO_STR_ARG);
        string s2 = ((stringcount >= 2) ? ReadString() : NO_STR_ARG);
@@ -267,8 +365,11 @@ void Read_Notification(float is_new)
        float f3 = ((floatcount >= 3) ? ReadLong() : NO_FL_ARG);
        float f4 = ((floatcount == 4) ? ReadLong() : NO_FL_ARG);
 
+       #ifdef NOTIFICATIONS_DEBUG
+               dprint(sprintf("Read_Notification(%d) at %f: net_name = %s.\n", is_new, time, Get_Notif_Name(net_type, net_name)));
+       #endif
+       
        if(is_new) { Local_Notification_Without_VarArgs(net_type, net_name, stringcount, floatcount, s1, s2, s3, s4, f1, f2, f3, f4); }
-       else { print("received old notification? net_name = ", Get_Field_Value(F_NAME, net_type, net_name), ".\n"); }
 }
 #endif
 
@@ -307,44 +408,101 @@ float Write_Notification(entity client, float sf)
        return send; 
 }
 
-void Send_Notification(float broadcast, entity client, float net_type, float net_name, ...count)
+void Send_Notification(float broadcast, entity client,
+       float net_type, float net_name, ...count)
 {
-       if(broadcast && net_type && net_name)
+       // check supplied broadcast, target, type, and name for errors
+       #ifdef NOTIFICATIONS_DEBUG
        {
-               float stringcount = stof(Get_Field_Value(F_STRNUM, net_type, net_name));
-               float floatcount = stof(Get_Field_Value(F_FLNUM, net_type, net_name));
-               float i;
-
-               dprint("Send_Notification(", ftos(broadcast), ", ", ftos(net_type), ", ", Get_Field_Value(F_NAME, net_type, net_name), strcat(", ", ftos(count), ");\n"));
-               dprint("  ^--: stringcount: ", ftos(stringcount), ", floatcount: ", ftos(floatcount), ".\n");
-
-               if((stringcount + floatcount) > count) { backtrace(strcat("Not enough arguments for Send_Notification! ", strcat("stringcount(", ftos(stringcount), ") + floatcount(", ftos(floatcount), "),"), " > count(", ftos(count), ").\nCheck the notification definition and the function call for accuracy...?\n")); return; }
-               else if((stringcount + floatcount) < count) { backtrace(strcat("Too many arguments for Send_Notification! ", strcat("stringcount(", ftos(stringcount), ") + floatcount(", ftos(floatcount), "),"), " < count(", ftos(count), ").\nCheck the notification definition and the function call for accuracy...?\n")); return; }
-
-               entity notif = spawn();
-               notif.nent_broadcast = broadcast;
-               notif.nent_client = client;
-               notif.nent_net_type = net_type;
-               notif.nent_net_name = net_name;
-               notif.nent_stringcount = stringcount;
-               notif.nent_floatcount = floatcount; 
-               for(i = 0; i < stringcount; ++i) { notif.nent_strings[i] = strzone(...(i, string)); }
-               for(i = 0; i < floatcount; ++i) { notif.nent_floats[i] = ...((stringcount + i), float); }
+               #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)
+                       CHECKARG_TYPENAME(CENTER)
+                       CHECKARG_TYPENAME(WEAPON)
+                       CHECKARG_TYPENAME(DEATH)
+                       
+                       default: { checkargs = sprintf("Improper type: %d!", checkargs, net_type); break; }
+               }
+               #undef CHECKARG_TYPENAME
                
-               notif.think = Notification_Remove;
-               notif.nextthink = (time + 0.5); 
-
-               Net_LinkEntity(notif, FALSE, 0, Write_Notification);
-
-               if(!server_is_local)
+               if(checkargs != "") { checkargs = strcat(checkargs, " "); }
+               switch(broadcast)
                {
-                       Local_Notification_Without_VarArgs(net_type, net_name, stringcount, floatcount, IFSTR(0), IFSTR(1), IFSTR(2), IFSTR(3), IFFL(0), IFFL(1), IFFL(2), IFFL(3));
+                       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_TEAM:
+                       case NOTIF_TEAM_EXCEPT:
+                       {
+                               if not(teamplay) { checkargs = sprintf("%sTeamplay not active!", checkargs); }
+                               else if(clienttype(client) == CLIENTTYPE_NOTACLIENT)
+                               {
+                                       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; }
        }
-       else { backtrace("Incorrect usage of Send_Notification!\n"); }
+       #endif
+
+       // retreive counts for the arguments of this notification
+       float stringcount = Get_Notif_Strnum(net_type, net_name);
+       float floatcount = Get_Notif_Flnum(net_type, net_name);
+
+       #ifdef NOTIFICATIONS_DEBUG
+       {
+               dprint(sprintf("Send_Notification(%d, %d, %s, stringcount: %d, floatcount: %d, varargs: %d);\n",
+                       broadcast, net_type, Get_Notif_Name(net_type, net_name), stringcount, floatcount, count));
+
+               if((stringcount + 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"), stringcount, floatcount, count)); return; }
+               else if((stringcount + 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"), stringcount, floatcount, count)); return; }
+       }
+       #endif
+
+       entity notif = spawn();
+       notif.nent_broadcast = broadcast;
+       notif.nent_client = client;
+       notif.nent_net_type = net_type;
+       notif.nent_net_name = net_name;
+       notif.nent_stringcount = stringcount;
+       notif.nent_floatcount = floatcount;
+       
+       float i;
+       
+       for(i = 0; i < stringcount; ++i) { notif.nent_strings[i] = strzone(...(i, string)); }
+       for(i = 0; i < floatcount; ++i) { notif.nent_floats[i] = ...((stringcount + i), float); }
+       
+       notif.think = Notification_Remove;
+       notif.nextthink = (time + 0.5); 
+
+       Net_LinkEntity(notif, FALSE, 0, 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, stringcount, 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, 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)
+void Send_Notification_Without_VarArgs(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; }
        EIGHT_VARS_TO_VARARGS_VARLIST
@@ -353,10 +511,13 @@ void Send_Notification_Without_VarArgs(float broadcast, entity client, float net
        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)
+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 = stof(Get_Field_Value(F_STRNUM, net_type, net_name));
-       float floatcount = stof(Get_Field_Value(F_FLNUM, net_type, net_name));
+       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, NO_STR_ARG, NO_STR_ARG, f1, f2, f3, NO_FL_ARG);
 }