X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qc;h=1bfbca6ae107cf27eab18fe437035669cc140e02;hb=5dc80d0c5e0c7dd4ae62aa7d01ea0767b6046d5e;hp=44f8751733aab62e96406a890da8cee451966806;hpb=e78d58310d82e6cbd9543b1d06c1fd6ee8f195cd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 44f875173..1bfbca6ae 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -1837,7 +1837,13 @@ float get_model_parameters(string m, float sk)
 	fn = get_model_datafilename(m, sk, "txt");
 	fh = fopen(fn, FILE_READ);
 	if(fh < 0)
-		return 0;
+	{
+		sk = 0;
+		fn = get_model_datafilename(m, sk, "txt");
+		fh = fopen(fn, FILE_READ);
+		if(fh < 0)
+			return 0;
+	}
 
 	get_model_parameters_modelname = m;
 	get_model_parameters_modelskin = sk;
@@ -1953,3 +1959,23 @@ float vercmp(string v1, string v2)
 
 	return vercmp_recursive(v1, v2);
 }
+
+float u8_strsize(string s)
+{
+	float l, i, c;
+	l = 0;
+	for(i = 0; ; ++i)
+	{
+		c = str2chr(s, i);
+		if(c <= 0)
+			break;
+		++l;
+		if(c >= 0x80)
+			++l;
+		if(c >= 0x800)
+			++l;
+		if(c >= 0x10000)
+			++l;
+	}
+	return l;
+}