X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qc;h=05152d4bb595b27e7137e1976edb4a681aad6363;hp=dcdd74deef9523b7ce3ebd9fce53ac874f07db9b;hb=80811920732c5756699249adb24ed8d241699d73;hpb=5eafbda9690a04118ae0e1fac02b5e4cfacf7cd1

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index dcdd74dee..05152d4bb 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -236,6 +236,16 @@ string fstrunzone(string s)
 	return sc;
 }
 
+float fexists(string f)
+{
+    float fh;
+    fh = fopen(f, FILE_READ);
+    if (fh < 0)
+        return FALSE;
+    fclose(fh);
+    return TRUE;
+}
+
 // Databases (hash tables)
 #define DB_BUCKETS 8192
 void db_save(float db, string pFilename)
@@ -1367,18 +1377,22 @@ string textShortenToLength(string theText, float maxWidth, textLengthUpToLength_
 		return strcat(substring(theText, 0, textLengthUpToLength(theText, maxWidth - tw("..."), tw)), "...");
 }
 
-float isGametypeInFilter(float gt, float tp, string pattern)
+float isGametypeInFilter(float gt, float tp, float ts, string pattern)
 {
-	string subpattern, subpattern2, subpattern3;
+	string subpattern, subpattern2, subpattern3, subpattern4;
 	subpattern = strcat(",", GametypeNameFromType(gt), ",");
 	if(tp)
 		subpattern2 = ",teams,";
 	else
 		subpattern2 = ",noteams,";
+	if(ts)
+		subpattern3 = ",teamspawns,";
+	else
+		subpattern3 = ",noteamspawns,";
 	if(gt == GAME_RACE || gt == GAME_CTS)
-		subpattern3 = ",race,";
+		subpattern4 = ",race,";
 	else
-		subpattern3 = string_null;
+		subpattern4 = string_null;
 
 	if(substring(pattern, 0, 1) == "-")
 	{
@@ -1387,7 +1401,9 @@ float isGametypeInFilter(float gt, float tp, string pattern)
 			return 0;
 		if(strstrofs(strcat(",", pattern, ","), subpattern2, 0) >= 0)
 			return 0;
-		if(subpattern3 && strstrofs(strcat(",", pattern, ","), subpattern3, 0) >= 0)
+		if(strstrofs(strcat(",", pattern, ","), subpattern3, 0) >= 0)
+			return 0;
+		if(subpattern4 && strstrofs(strcat(",", pattern, ","), subpattern4, 0) >= 0)
 			return 0;
 	}
 	else
@@ -1396,7 +1412,8 @@ float isGametypeInFilter(float gt, float tp, string pattern)
 			pattern = substring(pattern, 1, strlen(pattern) - 1);
 		if(strstrofs(strcat(",", pattern, ","), subpattern, 0) < 0)
 		if(strstrofs(strcat(",", pattern, ","), subpattern2, 0) < 0)
-		if((!subpattern3) || strstrofs(strcat(",", pattern, ","), subpattern3, 0) < 0)
+		if(strstrofs(strcat(",", pattern, ","), subpattern3, 0) < 0)
+		if((!subpattern4) || strstrofs(strcat(",", pattern, ","), subpattern4, 0) < 0)
 			return 0;
 	}
 	return 1;
@@ -1982,3 +1999,27 @@ float u8_strsize(string s)
 	}
 	return l;
 }
+
+// translation helpers
+string language_filename(string s)
+{
+	string fn;
+	float fh;
+	fn = prvm_language;
+	if(fn == "" || fn == "dump")
+		return s;
+	fn = strcat(s, ".", fn);
+	if((fh = fopen(fn, FILE_READ)) >= 0)
+	{
+		fclose(fh);
+		return fn;
+	}
+	return s;
+}
+string CTX(string s)
+{
+	float p = strstrofs(s, "^", 0);
+	if(p < 0)
+		return s;
+	return substring(s, p+1, -1);
+}