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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-26 13:04:03 -0400 (Thu, 26 Mar 2009)
New Revision: 6311

Modified:
   trunk/data/qcsrc/server/w_hook.qc
Log:
hook: unlimited ammo PROPER handling


Modified: trunk/data/qcsrc/server/w_hook.qc
===================================================================
--- trunk/data/qcsrc/server/w_hook.qc	2009-03-26 16:53:51 UTC (rev 6310)
+++ trunk/data/qcsrc/server/w_hook.qc	2009-03-26 17:04:03 UTC (rev 6311)
@@ -154,17 +154,19 @@
 			{
 				if ( time > self.hook_time_ammodecrease )
 				{
-					if ( self.ammo_cells >= 1 )
+					if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 					{
-						if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
+						if ( self.ammo_cells >= frametime / hooked_ammodecrease_delay )
+						{
 							self.ammo_cells -= frametime / hooked_ammodecrease_delay;
-						// decrease next frame again
+							// decrease next frame again
+						}
+						else
+						{
+							self.hook_state |= HOOK_REMOVING;
+							W_SwitchWeapon_Force(self, w_getbestweapon(self));
+						}
 					}
-					else
-					{
-						self.hook_state |= HOOK_REMOVING;
-						W_SwitchWeapon_Force(self, w_getbestweapon(self));
-					}
 				}
 			}
 		}