This doesn't need to be a function

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 1ce0d0bedf8dcfb628d3288d914db5ef25892d92..a27d0de1b0b0192d94d36b5c106626fa7506d60b 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -3,18 +3,6 @@
 //  Last updated: December, 2012
 // ================================================
 
-// ======================
-//  Supporting Functions
-// ======================
-
-// team code replace
-string TCR(string input, string teamcolor, string teamtext) // TODO: MOVE TO UTIL.QC
-{
-       input = strreplace("^TC", teamcolor, input);
-       input = strreplace("^TT", teamtext, input);
-       return input;
-}
-
 #ifndef MENUQC
 // select between the normal or the gentle message string based on client (or server) settings
 string normal_or_gentle(string normal, string gentle)

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index de2d9f9fbc6d71275b99595e30462261013f4f6f..3af12436a223799ba8c853bf5206501cf08f2edc 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -9,7 +9,7 @@
 #define MSG_WEAPON 3 // "Personal" weapon messages (like "You got the Nex", sent to weapon notify panel)
 #define MSG_DEATH 4 // "Personal" AND "Global" death messages 
 
-string TCR(string input, string teamcolor, string teamtext); // team code replace
+#define TCR(input,teamcolor,teamtext) strreplace("^TC", teamcolor, strreplace("^TT", teamtext, input))
 
 void Dump_Notifications(float fh, float alsoprint);