From: Mario <mario.mario@y7mail.com>
Date: Sun, 1 Nov 2020 11:08:03 +0000 (+1000)
Subject: Melee only mutator does not require items in the map
X-Git-Tag: xonotic-v0.8.5~702
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fcac9ee80f504db6db8fe4b0bd35d614be7fa22a;p=xonotic%2Fxonotic-data.pk3dir.git

Melee only mutator does not require items in the map
---

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 3ef0b74b7..facfe02b7 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1137,7 +1137,7 @@ int MapInfo_CurrentFeatures()
 {
 	int req = 0;
     // TODO: find a better way to check if weapons are required on the map
-	if(!(cvar("g_instagib") || cvar("g_overkill") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") 
+	if(!(cvar("g_instagib") || cvar("g_overkill") || cvar("g_nix") || cvar("g_weaponarena") || !cvar("g_pickup_items") || !cvar("g_melee_only") 
 		|| cvar("g_race") || cvar("g_cts") || cvar("g_nexball") || cvar("g_ca") || cvar("g_freezetag") || cvar("g_lms")))
 		req |= MAPINFO_FEATURE_WEAPONS;
 	return req;