Brilliant idea: do color code replacements on init, not runtime

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 43b27082cd8097f1c3e999df41eb6a8d06a3bbfb..ccc9394a90dfb047829b83946eefc4d2fbc3af2b 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -64,7 +64,7 @@ string Fill_Notif_Args(string args, string input,
                        if(sel_num == 7) { print("Hit maximum arguments!\n"); break; }
                }
 
-               return sprintf(CCR(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]);
+               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]);
        }
 
        return "";

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 243aaaf3cba2bb82ccc02906b0c3c677cdf3fd08..41b4c0eecca07760a5965f38a69271d08a54343c 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -671,9 +671,9 @@ entity msg_death_notifs[NOTIF_MAX];
                notif.nent_stringcount = strnum; \
                notif.nent_floatcount = flnum; \
                if(icon != "") { notif.nent_icon = strzone(icon); } \
-               if(normal != "") { notif.nent_normal = strzone(normal); } \
+               if(normal != "") { notif.nent_normal = strzone(CCR(normal)); } \
                else { print(sprintf("^1EMPTY NOTIFICATION: ^7net_type = MSG_%s, net_name = %s.\n", strtoupper(#type), #name)); } \
-               if(gentle != "") { notif.nent_gentle = strzone(gentle); } \
+               if(gentle != "") { notif.nent_gentle = strzone(CCR(gentle)); } \
                #if check_newline \
                        if(normal != "") { if not(substring(normal, (strlen(normal) - 1), 1) == "\n") { print(sprintf("^1MISSING/BROKEN NEW LINE AT END OF NOTIFICATION: ^7net_type = MSG_%s, net_name = %s, NORMAL string.\n", strtoupper(#type), #name)); } } \
                        if(gentle != "") { if not(substring(gentle, (strlen(gentle) - 1), 1) == "\n") { print(sprintf("^1MISSING/BROKEN NEW LINE AT END OF NOTIFICATION: ^7net_type = MSG_%s, net_name = %s, GENTLE string.\n", strtoupper(#type), #name)); } } \