X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qh;h=756e02cf51ffeb8aa85970233bfe7007d60818b9;hb=982216a30fcffb4b9581034ea6fbd94c7f349c7f;hp=f20cbd57a0e05701a3668f4ebebadc7d8a9c842f;hpb=011b34769955080ab1eaffd23683c2bc3d6da693;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index f20cbd57a..756e02cf5 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -156,6 +156,9 @@ 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 +ERASEABLE +string translate_key(string key); + // x-encoding (encoding as zero length invisible string) // encodes approx. 14 bits into 5 bytes of color code string const float XENCODE_MAX = 21295; // 2*22*22*22-1 @@ -198,7 +201,7 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t #else #define GENTLE autocvar_sv_gentle #endif - #define normal_or_gentle(normal, gentle) (GENTLE ? ((gentle != "") ? gentle : normal) : normal) + #define normal_or_gentle(normal, gentle) ((GENTLE && (gentle != "")) ? gentle : normal) #endif #ifdef GAMEQC