From 21f8376831537b47aa2f6e72aea7a9dd23f391b7 Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 12 Jul 2009 15:47:16 +0000 Subject: [PATCH] fix some more stuff separating rc/cts git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7204 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/common/util.qc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/common/util.qc b/data/qcsrc/common/util.qc index 3fb8616c7..6ac305c82 100644 --- a/data/qcsrc/common/util.qc +++ b/data/qcsrc/common/util.qc @@ -425,8 +425,9 @@ string GametypeNameFromType(float g) 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 @@ string textShortenToWidth(string theText, float maxWidth, textLengthUpToWidth_wi 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 @@ 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) + return 0; } else { @@ -1323,6 +1330,7 @@ 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) return 0; } return 1; -- 2.39.2