X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qc;h=2c6636a3b9a8bd8169ba0cacbc3c9b47cf9d6b92;hp=d1503a7b6b8bae9ea53c37c7bce2717ac64931f4;hb=c708a29f90d269bc654dd45a70dc020ab633e759;hpb=e0ac5f9f14e169a1e19d0e36b85cab061a74ed93

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index d1503a7b6..2c6636a3b 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -874,7 +874,7 @@ float cvar_settemp(string tmp_cvar, string tmp_value)
 
 	if(!cvar_type(tmp_cvar))
 	{
-		print(sprintf("Error: cvar %s doesn't exist!\n", tmp_cvar));
+		printf("Error: cvar %s doesn't exist!\n", tmp_cvar);
 		return 0;
 	}
 
@@ -911,7 +911,7 @@ float cvar_settemp_restore()
 			++i;
 		}
 		else
-			print(sprintf("Error: cvar %s doesn't exist anymore! It can still be restored once it's manually recreated.\n", e.netname));
+			printf("Error: cvar %s doesn't exist anymore! It can still be restored once it's manually recreated.\n", e.netname);
 	}
 
 	return i;
@@ -1312,7 +1312,7 @@ string find_last_color_code(string s)
 			++carets;
 
 		// check if carets aren't all escaped
-		if (carets == 1 || mod(carets, 2) == 1) // first check is just an optimization
+		if (carets & 1)
 		{
 			if(i+1 <= len)
 			if(strstrofs("0123456789", substring(s, i+1, 1), 0) >= 0)
@@ -2106,6 +2106,8 @@ float get_model_parameters(string m, float sk)
 			get_model_parameters_weight = stof(s);
 		if(c == "age")
 			get_model_parameters_age = stof(s);
+		if(c == "description")
+			get_model_parameters_description = s;
 		if(c == "bone_upperbody")
 			get_model_parameters_bone_upperbody = s;
 		if(c == "bone_weapon")
@@ -2752,3 +2754,55 @@ float Announcer_PickNumber(float type, float num)
 	return NOTIF_ABORT; // abort sending if none of these numbers were right
 }
 #endif
+
+#ifndef MENUQC
+float Mod_Q1BSP_SuperContentsFromNativeContents(float nativecontents)
+{
+	switch(nativecontents)
+	{
+		case CONTENT_EMPTY:
+			return 0;
+		case CONTENT_SOLID:
+			return DPCONTENTS_SOLID | DPCONTENTS_OPAQUE;
+		case CONTENT_WATER:
+			return DPCONTENTS_WATER;
+		case CONTENT_SLIME:
+			return DPCONTENTS_SLIME;
+		case CONTENT_LAVA:
+			return DPCONTENTS_LAVA | DPCONTENTS_NODROP;
+		case CONTENT_SKY:
+			return DPCONTENTS_SKY | DPCONTENTS_NODROP | DPCONTENTS_OPAQUE; // to match behaviour of Q3 maps, let sky count as opaque
+	}
+	return 0;
+}
+
+float Mod_Q1BSP_NativeContentsFromSuperContents(float supercontents)
+{
+	if(supercontents & (DPCONTENTS_SOLID | DPCONTENTS_BODY))
+		return CONTENT_SOLID;
+	if(supercontents & DPCONTENTS_SKY)
+		return CONTENT_SKY;
+	if(supercontents & DPCONTENTS_LAVA)
+		return CONTENT_LAVA;
+	if(supercontents & DPCONTENTS_SLIME)
+		return CONTENT_SLIME;
+	if(supercontents & DPCONTENTS_WATER)
+		return CONTENT_WATER;
+	return CONTENT_EMPTY;
+}
+#endif
+
+vector bezier_quadratic_getpoint(vector a, vector b, vector c, float t)
+{
+	return
+		(c - 2 * b + a) * (t * t) +
+		(b - a) * (2 * t) +
+		a;
+}
+
+vector bezier_quadratic_getderivative(vector a, vector b, vector c, float t)
+{
+	return
+		(c - 2 * b + a) * (2 * t) +
+		(b - a) * 2;
+}