X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qh;h=a9f3a9ffaad2de6267e5f7bf82c7bec733c0b3da;hb=c787284d1dfdc6191dc2bfc96ddaa2819a94224f;hp=a2774aa509d1dd1909849f29cb959e95227fe2bd;hpb=7029c1b56f76ec1efa593c4509dffee0c393a2a9;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index a2774aa50..a9f3a9ffa 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -28,8 +28,6 @@ string ftos_decimals(float number, float decimals); bool fexists(string f); -vector colormapPaletteColor(float c, float isPants); - // unzone the string, and return it as tempstring. Safe to be called on string_null string fstrunzone(string s); @@ -103,11 +101,6 @@ float almost_in_bounds(float a, float b, float c); float power2of(float e); float log2of(float x); -const string HEXDIGITS = "0123456789ABCDEF0123456789abcdef"; -#define HEXDIGIT_TO_DEC_RAW(d) (strstrofs(HEXDIGITS, (d), 0)) -#define HEXDIGIT_TO_DEC(d) ((HEXDIGIT_TO_DEC_RAW(d) | 0x10) - 0x10) -#define DEC_TO_HEXDIGIT(d) (substring(HEXDIGITS, (d), 1)) - vector rgb_to_hsl(vector rgb); vector hsl_to_rgb(vector hsl); vector rgb_to_hsv(vector rgb); @@ -176,11 +169,7 @@ float float2range01(float f); float gsl_ran_gaussian(float sigma); -string car(string s); // returns first word -string cdr(string s); // returns all but first word float matchacl(string acl, string str); // matches str against ACL acl (with entries +foo*, +foo, +*foo, +*foo*, and same with - for forbidding) -float startsWith(string haystack, string needle); -float startsWithNocase(string haystack, string needle); string get_model_datafilename(string mod, float skn, string fil); // skin -1 will return wildcard, mod string_null will also put wildcard there string get_model_parameters_modelname; @@ -200,8 +189,6 @@ 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 -vector vec2(vector v); - #ifndef MENUQC vector NearestPointOnBox(entity box, vector org); #endif @@ -217,10 +204,6 @@ const float XENCODE_LEN = 5; string xencode(float f); float xdecode(string s); -#ifdef CSQC -entity ReadCSQCEntity(); -#endif - #ifndef MENUQC string strtolower(string s); #endif @@ -284,13 +267,6 @@ string CCR(string input); #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