From 45cfcc7938168f0bb8eb7896fa5a87b2ffd042e6 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 31 Mar 2009 13:57:09 +0000 Subject: [PATCH] don't spawn item_jetpack if g_grappling_hook is 1 git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6393 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/t_items.qc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index 2b97a35d3..30169c624 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -1318,6 +1318,8 @@ void spawnfunc_item_fuel_regen(void) void spawnfunc_item_jetpack(void) { + if(g_grappling_hook) + return; // sorry, but these two can't coexist (same button) if(!self.ammo_fuel) self.ammo_fuel = g_pickup_fuel_jetpack; StartItem ("models/items/g_jetpack.md3", "misc/itempickup.wav", g_pickup_respawntime_powerup, "Jet pack", IT_JETPACK, 0, FL_POWERUP, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW); -- 2.39.2