Merge branch 'DefaultUser/mapinfo_without_weapons_in_ca' into 'master'

CA doesn't require weapons on maps

See merge request xonotic/xonotic-data.pk3dir!756

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index d0931b6983df28006d069fd3d5acffc2b3630048..64ab8dacaafa1c5f1748765566f7d00ef56bc90c 100644 (file)
--- 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;
 }