From: Mario <mario.mario@y7mail.com>
Date: Tue, 14 Jul 2020 08:43:50 +0000 (+1000)
Subject: Allow filtering for Quake 3 oneflag gametype entities when oneflag CTF is enabled
X-Git-Tag: xonotic-v0.8.5~873
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=201c74e481db7b85a9a9b198da9fd00b4a4092a4;p=xonotic%2Fxonotic-data.pk3dir.git

Allow filtering for Quake 3 oneflag gametype entities when oneflag CTF is enabled
---

diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index 4d469b455..c405b8a24 100644
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -5,6 +5,7 @@
 #include <server/items.qh>
 #include <server/resources.qh>
 #include <common/t_items.qh>
+#include <common/gamemodes/gamemode/ctf/sv_ctf.qh>
 #include <common/mapobjects/triggers.qh>
 #include <common/mapobjects/trigger/counter.qh>
 #include <common/mutators/mutator/buffs/buffs.qh>
@@ -294,11 +295,13 @@ bool DoesQ3ARemoveThisEntity(entity this)
 			gametypename = "team";
 		if(g_ctf)
 			gametypename = "ctf";
+		if(g_ctf && ctf_oneflag)
+			gametypename = "oneflag";
 		if(g_duel)
 			gametypename = "tournament";
 		if(maxclients == 1)
 			gametypename = "single";
-		// we do not have the other types (oneflag, obelisk, harvester, teamtournament)
+		// we do not have the other types (obelisk, harvester, teamtournament)
 		if(strstrofs(this.gametype, gametypename, 0) < 0)
 			return true;
 	}