From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 18 Feb 2011 14:55:59 +0000 (+0100)
Subject: also support notq3a/notta fields, by considering any teamplay non-DM non-CTF game... 
X-Git-Tag: xonotic-v0.5.0~311^2~7^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=da1e4892d10f7e5f472e7171ebfca221c77b3a82;p=xonotic%2Fxonotic-data.pk3dir.git

also support notq3a/notta fields, by considering any teamplay non-DM non-CTF game type a "team arena" game type
---

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index b96599475..8cc7e4797 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -135,13 +135,19 @@ void spawnfunc_item_flight()         { spawnfunc_item_jetpack();       }
 .float notsingle;
 .float notfree;
 .float notq3a;
+.float notta;
 .string gametype;
 float DoesQ3ARemoveThisEntity()
 {
 	// Q3 style filters (DO NOT USE, THIS IS COMPAT ONLY)
 
 	if(self.notq3a)
-		return 1;
+		if(!teams_matter || g_tdm || g_ctf)
+			return 1;
+
+	if(self.notta)
+		if not(!teams_matter || g_tdm || g_ctf)
+			return 1;
 
 	if(self.notsingle)
 		if(maxclients == 1)