Merge branch 'master' into Mario/vehicles

[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 310833e4367ce2f036ad10c4570be683bfb4f275..b5cb030d077b21c5b8a39ec8f0f5121d8f3f6032 100644 (file)
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -11,7 +11,7 @@
     #include "autocvars.qh"
     #include "constants.qh"
     #include "defs.qh"
-    #include "vehicles/vehicles_def.qh"
+    #include "../common/vehicles/sv_vehicles.qh"
     #include "command/common.qh"
     #include "g_hook.qh"
     #include "round_handler.qh"
@@ -318,7 +318,7 @@ void FireGrapplingHook (void)
        float s;
        vector vs;
 
-       if(forbidWeaponUse()) return;
+       if(forbidWeaponUse(self)) return;
        if(self.vehicle) return;
 
        makevectors(self.v_angle);