From ecf545589f9da4da54378cb19bfdc377363276bf Mon Sep 17 00:00:00 2001 From: TimePath Date: Mon, 29 Dec 2014 11:42:17 +1100 Subject: [PATCH] Check for jetpack activation, fixes #1438 Check for jetpack, fixes #1439 --- qcsrc/server/cl_physics.qc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc index 900f65bc8..bf555d4fc 100644 --- a/qcsrc/server/cl_physics.qc +++ b/qcsrc/server/cl_physics.qc @@ -169,12 +169,13 @@ void CheckPlayerJump() float air_jump = !PlayerJump() || self.multijump_count > 0; // PlayerJump() has important side effects float activate = self.cvar_cl_jetpack_jump && air_jump && self.BUTTON_JUMP || self.BUTTON_JETPACK; float has_fuel = !autocvar_g_jetpack_fuel || self.ammo_fuel || self.items & IT_UNLIMITED_WEAPON_AMMO; - if (self.jetpack_stopped) { } + if (!(self.items & IT_JETPACK)) { } + else if (self.jetpack_stopped) { } else if (!has_fuel) { if (was_flying) // TODO: ran out of fuel message Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_JETPACK_NOFUEL); - else + else if (activate) Send_Notification(NOTIF_ONE, self, MSG_INFO, INFO_JETPACK_NOFUEL); self.jetpack_stopped = TRUE; self.items &= ~IT_USING_JETPACK; -- 2.39.2