From ed5c2911bf648fc092e8271701a9079a4d9d5485 Mon Sep 17 00:00:00 2001 From: Samual Date: Fri, 23 Sep 2011 01:52:17 -0400 Subject: [PATCH] Add checks to make sure you can't fire hook while inside a vehicle, and also remove any current hooks you have when you enter a vehicle --- qcsrc/server/g_hook.qc | 7 +++++-- qcsrc/server/vehicles/vehicles.qc | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index 76faad923..4f655ca57 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -296,8 +296,11 @@ void FireGrapplingHook (void) if((arena_roundbased && time < warmup) || (time < game_starttime)) return; - if(self.freezetag_frozen) - return; + if(self.freezetag_frozen) + return; + + if(self.vehicle) + return; makevectors(self.v_angle); diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc index d9d77b5f5..6006dcf92 100644 --- a/qcsrc/server/vehicles/vehicles.qc +++ b/qcsrc/server/vehicles/vehicles.qc @@ -428,6 +428,8 @@ void vehicles_enter() if(self.team) if(self.team != other.team) return; + + RemoveGrapplingHook(other); self.vehicle_ammo1 = 0; self.vehicle_ammo2 = 0; -- 2.39.2