X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qh;h=dab177b358277e0862f3b6227cd19ce72c07c5e5;hb=99e4fa0264127dfcf4675d5f645061b51af815e4;hp=497183ad9251007460e232737a0cc1f0c0d1d0ac;hpb=ce0fbe4fd4f6edac3062ef5bf0af49814db337eb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 497183ad9..dab177b35 100644
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -1,9 +1,6 @@
 // a dummy macro that prevents the "hanging ;" warning
 #define ENDS_WITH_CURLY_BRACE
 
-// return the actual code name of a var as a string
-#define VAR_TO_TEXT(var) #var
-
 #ifdef HAVE_YO_DAWG_CPP
 // TODO make ascii art pic of xzibit
 // YO DAWG!
@@ -43,7 +40,7 @@ void ACCUMULATE_call(string func)
 // used for simplifying ACCUMULATE_FUNCTIONs
 #define SET_FIRST_OR_LAST(input,first,count) if(!input) { input = (first + count); }
 #define SET_FIELD_COUNT(field,first,count) if(!field) { field = (first + count); ++count; }
-#define CHECK_MAX_COUNT(name,max,count,type) if(count == max) { error(strcat("Maximum ", type, " hit: ", VAR_TO_TEXT(name), ": ", ftos(count), ".\n")); }
+#define CHECK_MAX_COUNT(name,max,count,type) if(count == max) { error(strcat("Maximum ", type, " hit: ", #name, ": ", ftos(count), ".\n")); }
 
 // this returns a tempstring containing a copy of s with additional \n newlines added, it also replaces \n in the text with a real newline
 // NOTE: s IS allowed to be a tempstring
@@ -274,6 +271,7 @@ switch(id) {\
 	case HUD_PANEL_INFOMESSAGES: panel_name = HUD_PANELNAME_INFOMESSAGES; break; \
 	case HUD_PANEL_PHYSICS: panel_name = HUD_PANELNAME_PHYSICS; break; \
 	case HUD_PANEL_CENTERPRINT: panel_name = HUD_PANELNAME_CENTERPRINT; break; \
+	case HUD_PANEL_ITEMSTIME: panel_name = HUD_PANELNAME_ITEMSTIME; break; \
 } ENDS_WITH_CURLY_BRACE
 
 // Get name of specified panel id
@@ -380,9 +378,6 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t
 // expand multiple arguments into one argument by stripping parenthesis
 #define XPD(...) __VA_ARGS__
 
-float Count_Proper_Strings(string improper, string...count);
-float Count_Proper_Floats(float improper, float...count);
-
 #ifndef MENUQC
 void backtrace(string msg);
 #endif
@@ -422,27 +417,17 @@ vector vec3(float x, float y, float z);
 vector animfixfps(entity e, vector a, vector b);
 #endif
 
-#define count_seconds_decs(time,decs) count_append(time, \
-		_("%.##decs##f seconds"), /* zeroth */ \
-		_("%.##decs##f seconds"),  /* first */ \
-		_("%.##decs##f seconds"), /* second */ \
-		_("%.##decs##f seconds"), /* third */ \
-		_("%.##decs##f seconds")) /* multi */ \
-
-#define count_seconds(time) count_append(time, \
-		_("0 seconds"), /* zeroth */ \
-		_("1 second"),  /* first */ \
-		_("2 seconds"), /* second */ \
-		_("3 seconds"), /* third */ \
-		_("%d seconds")) /* multi */ \
-
-#define count_ordinal(time) count_append(time, \
-		_("0th"), /* zeroth */ \
-		_("1st"),  /* first */ \
-		_("2nd"), /* second */ \
-		_("3rd"), /* third */ \
-		_("%dth")) /* multi */ \
-
-string count_append(float time, string zeroth, string first, string second, string third, string multi);
-
-string process_time(float seconds, float output);
+#ifdef SVQC
+void dedicated_print(string input);
+#endif
+
+// todo: better way to do this?
+#ifdef MENUQC
+#define PROGNAME "MENUQC"
+#else
+#ifdef SVQC
+#define PROGNAME "SVQC"
+#else
+#define PROGNAME "CSQC"
+#endif
+#endif