Weapons: Introduce concept of offhand weapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_hook.qc

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index c101d7271e3cc5bd4d2be16c30a4ce15f237c3fc..88c9783f522a8169cd3a1e689681fa4678ee65a6 100644 (file)
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -422,6 +422,7 @@ void FireGrapplingHook (void)
 //         // if I have no hook or it's not pulling yet, make sure I'm not flying!
 //         if((self.hook == world || !self.hook.state) && self.movetype == MOVETYPE_FLY)
 
+void _GrapplingHookFrame();
 void GrapplingHookFrame()
 {SELFPARAM();
        if(g_grappling_hook && timeout_status != TIMEOUT_ACTIVE && self.weapon != WEP_HOOK.m_id && !self.vehicle)
@@ -460,12 +461,16 @@ void GrapplingHookFrame()
        }
        self.hook_switchweapon = self.BUTTON_HOOK;
 
-       if(!g_grappling_hook && self.weapon != WEP_HOOK.m_id)
+       if(!g_grappling_hook && self.weapon != WEP_HOOK.m_id && self.offhand != OFFHAND_HOOK)
        {
                self.hook_state &= ~HOOK_FIRING;
                self.hook_state |= HOOK_REMOVING;
        }
+       _GrapplingHookFrame();
+}
 
+void _GrapplingHookFrame()
+{
        if (self.hook_state & HOOK_FIRING)
        {
                if (self.hook)