From: Freddy <schro.sb@gmail.com>
Date: Sun, 12 Jan 2020 19:01:41 +0000 (+0100)
Subject: CA doesn't require weapons on maps
X-Git-Tag: xonotic-v0.8.5~1105^2~17^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F756%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

CA doesn't require weapons on maps
---

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index d0931b698..64ab8daca 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1141,7 +1141,8 @@ string MapInfo_FixName(string s)
 int MapInfo_CurrentFeatures()
 {
 	int req = 0;
-	if(!(cvar("g_lms") || cvar("g_instagib") || cvar("g_overkill") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball")))
+    // TODO: find a better way to check if weapons are required on the map
+	if(!(cvar("g_lms") || cvar("g_instagib") || cvar("g_overkill") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || cvar("g_race") || cvar("g_cts") || cvar("g_nexball") || cvar("g_ca")))
 		req |= MAPINFO_FEATURE_WEAPONS;
 	return req;
 }