[nexuiz-commits] r6377 - in trunk/data: models/items qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-30 09:10:13 -0400 (Mon, 30 Mar 2009)
New Revision: 6377

Added:
   trunk/data/models/items/g_jetpack.md3
   trunk/data/models/items/jetpack.tga
Modified:
   trunk/data/qcsrc/server/cl_client.qc
Log:
jetpack: item_jetpack now has a model


Added: trunk/data/models/items/g_jetpack.md3
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/items/g_jetpack.md3
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/models/items/jetpack.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/models/items/jetpack.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-03-30 12:59:37 UTC (rev 6376)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-03-30 13:10:13 UTC (rev 6377)
@@ -2368,8 +2368,11 @@
 		if(frametime)
 		{
 			W_WeaponFrame();
+
+			self.items &~= IT_FUEL; // TODO don't do this if the current weapon actually USES fuel...
 			if(self.items & IT_JETPACK)
-				self.items |= IT_FUEL;
+				if(self.items & IT_FUEL_REGEN || self.ammo_fuel >= 0.01)
+					self.items |= IT_FUEL;
 		}
 
 		player_regen();