[nexuiz-commits] r7204 - trunk/data/qcsrc/common

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-07-12 11:47:16 -0400 (Sun, 12 Jul 2009)
New Revision: 7204

Modified:
   trunk/data/qcsrc/common/util.qc
Log:
fix some more stuff separating rc/cts


Modified: trunk/data/qcsrc/common/util.qc
===================================================================
--- trunk/data/qcsrc/common/util.qc	2009-07-12 12:11:55 UTC (rev 7203)
+++ trunk/data/qcsrc/common/util.qc	2009-07-12 15:47:16 UTC (rev 7204)
@@ -425,8 +425,9 @@
 	else if (g == GAME_KEYHUNT) return "kh";
 	else if (g == GAME_ONSLAUGHT) return "ons";
 	else if (g == GAME_ASSAULT) return "as";
-	else if (g == GAME_RACE) return "race";
+	else if (g == GAME_RACE) return "rc";
 	else if (g == GAME_NEXBALL) return "nexball";
+	else if (g == GAME_CTS) return "cts";
 	return "dm";
 }
 
@@ -1302,12 +1303,16 @@
 
 float isGametypeInFilter(float gt, float tp, string pattern)
 {
-	string subpattern, subpattern2;
+	string subpattern, subpattern2, subpattern3;
 	subpattern = strcat(",", GametypeNameFromType(gt), ",");
 	if(tp)
 		subpattern2 = ",teams,";
 	else
 		subpattern2 = ",noteams,";
+	if(gt == GAME_RACE || gt == GAME_CTS)
+		subpattern3 = ",race,";
+	else
+		subpattern3 = string_null;
 
 	if(substring(pattern, 0, 1) == "-")
 	{
@@ -1316,6 +1321,8 @@
 			return 0;
 		if(strstrofs(strcat(",", pattern, ","), subpattern2, 0) >= 0)
 			return 0;
+		if(subpattern3 && strstrofs(strcat(",", pattern, ","), subpattern3, 0) >= 0)
+			return 0;
 	}
 	else
 	{
@@ -1323,6 +1330,7 @@
 			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)
 			return 0;
 	}
 	return 1;