From: bones_was_here <bones_was_here@yahoo.com.au>
Date: Fri, 10 Jul 2020 10:58:48 +0000 (+1000)
Subject: Run maps supporting Q3A and Q3TA in TA mode
X-Git-Tag: xonotic-v0.8.5~352^2~85
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6c1941c9ca16b4db6a166c17d339ef140dbf8205;p=xonotic%2Fxonotic-data.pk3dir.git

Run maps supporting Q3A and Q3TA in TA mode
---

diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index 4d469b455..dc1d2eaa7 100644
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -258,20 +258,16 @@ spawnfunc(target_fragsFilter)
 .float notteam;
 .float notsingle;
 .float notfree;
-.float notq3a;
 .float notta;
 .string gametype;
 bool DoesQ3ARemoveThisEntity(entity this)
 {
 	// Q3 style filters (DO NOT USE, THIS IS COMPAT ONLY)
 
-	if(this.notq3a)
-		if(!teamplay || g_tdm || g_ctf)
-			return true;
-
+	// Q3 mappers use "notq3a" or "notta" to disable an entity in Q3A or Q3TA
+	// Xonotic has ~equivalent features to Team Arena
 	if(this.notta)
-		if (!(!teamplay || g_tdm || g_ctf))
-			return true;
+		return true;
 
 	if(this.notsingle)
 		if(maxclients == 1)