From: terencehill <piuntn@gmail.com>
Date: Thu, 22 Jun 2017 22:59:20 +0000 (+0200)
Subject: Don't define CCR and related autocvars in the menu
X-Git-Tag: xonotic-v0.8.5~2708
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8592583207e44a4cd506c161c96c133ac47615b1;p=xonotic%2Fxonotic-data.pk3dir.git

Don't define CCR and related autocvars in the menu
---

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 547384cdd..7ae9ab42a 100644
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -256,7 +256,9 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t
 #define fprintf(file, ...) fputs(file, sprintf(__VA_ARGS__))
 #define bprintf(...) bprint(sprintf(__VA_ARGS__))
 
+#ifdef GAMEQC
 string CCR(string input);
+#endif
 
 #ifdef GAMEQC
 	#ifdef CSQC
diff --git a/qcsrc/lib/string.qh b/qcsrc/lib/string.qh
index 617891d8b..9f0c5ca13 100644
--- a/qcsrc/lib/string.qh
+++ b/qcsrc/lib/string.qh
@@ -72,6 +72,7 @@ string ColorTranslateRGB(string s)
 	return (ColorTranslateMode & 1) ? strdecolorize(s) : s;
 }
 
+#ifdef GAMEQC
 // color code replace, place inside of sprintf and parse the string... defaults described as constants
 // foreground/normal colors
 string autocvar_hud_colorset_foreground_1 = "2"; // F1 - Green  // primary priority (important names, etc)
@@ -106,6 +107,7 @@ string CCR(string input)
 	input = strreplace("^N", "^7", input);  // "none"-- reset to white...
 	return input;
 }
+#endif
 
 #define startsWith(haystack, needle) (strstrofs(haystack, needle, 0) == 0)