From 26ec9548c0e1b205f58357db3d8507382e7cb9c3 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Thu, 7 Feb 2013 05:22:50 -0500 Subject: [PATCH] Undo that macrofication... Apparently, not EVERYTHING should be a macro --- qcsrc/common/util.qc | 22 ++++++++++++++++++++++ qcsrc/common/util.qh | 10 +--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index 0cc53bd33..dc882194e 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -2530,3 +2530,25 @@ void backtrace(string msg) cvar_set("prvm_backtraceforwarnings", ftos(war)); } #endif + +// color code replace, place inside of sprintf and parse the string +string CCR(string input) +{ + // See the autocvar declarations in util.qh for default values + + // foreground/normal colors + input = strreplace("^F1", strcat("^", autocvar_hud_colorset_foreground_1), input); + input = strreplace("^F2", strcat("^", autocvar_hud_colorset_foreground_2), input); + input = strreplace("^F3", strcat("^", autocvar_hud_colorset_foreground_3), input); + input = strreplace("^F4", strcat("^", autocvar_hud_colorset_foreground_4), input); + + // "kill" colors + input = strreplace("^K1", strcat("^", autocvar_hud_colorset_kill_1), input); + input = strreplace("^K2", strcat("^", autocvar_hud_colorset_kill_2), input); + input = strreplace("^K3", strcat("^", autocvar_hud_colorset_kill_3), input); + + // background colors + input = strreplace("^BG", strcat("^", autocvar_hud_colorset_background), input); + input = strreplace("^N", "^7", input); // "none"-- reset to white... + return input; +} diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index 072def8e4..316ee7277 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -394,15 +394,7 @@ var string autocvar_hud_colorset_kill_3 = "4"; // K3 - Blue // "good" or "bene // background color var string autocvar_hud_colorset_background = "7"; // BG - White // neutral/unimportant text -#define CCR(input) strreplace("^F1", strcat("^", autocvar_hud_colorset_foreground_1), \ - strreplace("^F2", strcat("^", autocvar_hud_colorset_foreground_2), \ - strreplace("^F3", strcat("^", autocvar_hud_colorset_foreground_3), \ - strreplace("^F4", strcat("^", autocvar_hud_colorset_foreground_4), \ - strreplace("^K1", strcat("^", autocvar_hud_colorset_kill_1), \ - strreplace("^K2", strcat("^", autocvar_hud_colorset_kill_2), \ - strreplace("^K3", strcat("^", autocvar_hud_colorset_kill_3), \ - strreplace("^BG", strcat("^", autocvar_hud_colorset_background), \ - strreplace("^N", "^7", input))))))))) +string CCR(string input); #ifndef MENUQC #ifdef CSQC -- 2.39.2