X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qh;h=bd603b74c25905b90edd304a116d12e3d0019576;hb=132c0b023f7b022317d0217130d8f03629c7ad3e;hp=072def8e474660237d0d7fa40961dca435d9a4ad;hpb=774331f6bffb54312749c9d4ee1f8109c9507106;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 072def8e4..bd603b74c 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
@@ -258,6 +255,12 @@ float get_model_parameters_species;
 string get_model_parameters_sex;
 float get_model_parameters_weight;
 float get_model_parameters_age;
+string get_model_parameters_bone_upperbody;
+string get_model_parameters_bone_weapon;
+#define MAX_AIM_BONES 4
+string get_model_parameters_bone_aim[MAX_AIM_BONES];
+float get_model_parameters_bone_aimweight[MAX_AIM_BONES];
+float get_model_parameters_fixbone;
 string get_model_parameters_desc;
 float get_model_parameters(string mod, float skn); // call with string_null to clear; skin -1 means mod is the filename of the txt file and is to be split
 
@@ -355,8 +358,6 @@ void queue_to_execute_next_frame(string s);
 // for marking written-to values as unused where it's a good idea to do this
 noref float unused_float;
 
-
-
 // a function f with:
 // f(0) = 0
 // f(1) = 1
@@ -376,10 +377,9 @@ 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
 
 // color code replace, place inside of sprintf and parse the string... defaults described as constants
 // foreground/normal colors
@@ -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
@@ -410,4 +402,31 @@ var string autocvar_hud_colorset_background = "7"; // BG - White // neutral/unim
 #else
 #define GENTLE autocvar_sv_gentle
 #endif
+#define normal_or_gentle(normal,gentle) (GENTLE ? ((gentle != "") ? gentle : normal) : normal)
+#endif
+
+// allow writing to also pass through to spectators (like so spectators see the same centerprints as players for example)
+#define WRITESPECTATABLE_MSG_ONE_VARNAME(varname,statement) entity varname; varname = msg_entity; FOR_EACH_REALCLIENT(msg_entity) if(msg_entity == varname || (msg_entity.classname == STR_SPECTATOR && msg_entity.enemy == varname)) statement msg_entity = varname
+#define WRITESPECTATABLE_MSG_ONE(statement) WRITESPECTATABLE_MSG_ONE_VARNAME(oldmsg_entity, statement)
+#define WRITESPECTATABLE(msg,statement) if(msg == MSG_ONE) { WRITESPECTATABLE_MSG_ONE(statement); } else statement float WRITESPECTATABLE_workaround = 0
+
+vector vec3(float x, float y, float z);
+
+#ifndef MENUQC
+vector animfixfps(entity e, vector a, vector b);
+#endif
+
+#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