From: TimePath <andrew.hardaker1995@gmail.com>
Date: Tue, 6 Oct 2015 00:07:24 +0000 (+1100)
Subject: Hook: don't give weapon when offhand is active
X-Git-Tag: xonotic-v0.8.2~1874^2~5
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6bd5109b971e76a37625010fa71095789406ed80;ds=sidebyside

Hook: don't give weapon when offhand is active
---

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 910f33b739..37df8fa88a 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -501,8 +501,6 @@ float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still ne
 	else
 		d = !(!weaponinfo.weaponstart);
 
-	if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook
-		d |= (i == WEP_HOOK.m_id);
 	if(!g_cts && (weaponinfo.spawnflags & WEP_FLAG_MUTATORBLOCKED)) // never default mutator blocked guns
 		d = 0;