[nexuiz-commits] r6393 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-31 09:57:09 -0400 (Tue, 31 Mar 2009)
New Revision: 6393

Modified:
   trunk/data/qcsrc/server/t_items.qc
Log:
don't spawn item_jetpack if g_grappling_hook is 1


Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2009-03-31 13:37:36 UTC (rev 6392)
+++ trunk/data/qcsrc/server/t_items.qc	2009-03-31 13:57:09 UTC (rev 6393)
@@ -1318,6 +1318,8 @@
 
 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);