]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Add another check to make sure hook complains when it should
authorMario <mario.mario@y7mail.com>
Sun, 9 Jun 2013 04:58:05 +0000 (14:58 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 9 Jun 2013 04:58:05 +0000 (14:58 +1000)
qcsrc/server/cl_weaponsystem.qc

index 3a963d4baad1f054d74521fb4c3e49cbb0f8dc4d..a98eb6f55388e8b5cf755ff0b0525e51a6703093 100644 (file)
@@ -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)