From: Mario <mario.mario@y7mail.com>
Date: Sun, 9 Jun 2013 04:58:05 +0000 (+1000)
Subject: Add another check to make sure hook complains when it should
X-Git-Tag: xonotic-v0.8.0~366^2~25^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c62b090b342bab399152f8673c83c9884c5b8fb;p=xonotic%2Fxonotic-data.pk3dir.git

Add another check to make sure hook complains when it should
---

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 3a963d4ba..a98eb6f55 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -668,7 +668,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 	if(complain)
 		self.hasweapon_complain_spam = time + 0.2;
 		
-	if(wpn == WEP_HOOK && !g_grappling_hook && autocvar_g_nades && !WEPSET_CONTAINS_AW(weaponsInMap, wpn))
+	if(wpn == WEP_HOOK && !g_grappling_hook && autocvar_g_nades && !WEPSET_CONTAINS_EW(cl, wpn) && !WEPSET_CONTAINS_AW(weaponsInMap, wpn))
 		complain = 0;
 
 	if (wpn < WEP_FIRST || wpn > WEP_LAST)