]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Run maps supporting Q3A and Q3TA in TA mode
authorbones_was_here <bones_was_here@yahoo.com.au>
Fri, 10 Jul 2020 10:58:48 +0000 (20:58 +1000)
committerbones_was_here <bones_was_here@yahoo.com.au>
Fri, 10 Jul 2020 10:58:48 +0000 (20:58 +1000)
qcsrc/server/compat/quake3.qc

index 4d469b455dc1919c1061c238e10d8be061afc8fc..dc1d2eaa7aaab3731790707e5b09b6b4666ded4d 100644 (file)
@@ -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)