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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-01 09:14:03 -0400 (Tue, 01 Sep 2009)
New Revision: 7582

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
do not rot/regen fuel when using unlimited ammo


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-09-01 10:04:55 UTC (rev 7581)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-09-01 13:14:03 UTC (rev 7582)
@@ -1932,7 +1932,8 @@
 			self.event_damage(self, self, 1, DEATH_ROT, self.origin, '0 0 0');
 	}
 
-	self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, cvar("g_balance_fuel_regen"), cvar("g_balance_fuel_regenlinear"), regen_mod * frametime * (time > self.pauseregen_finished) * (self.items & IT_FUEL_REGEN != 0), maxf, cvar("g_balance_fuel_rot"), cvar("g_balance_fuel_rotlinear"), rot_mod * frametime * (time > self.pauserotfuel_finished), limitf);
+	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
+		self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, cvar("g_balance_fuel_regen"), cvar("g_balance_fuel_regenlinear"), regen_mod * frametime * (time > self.pauseregen_finished) * (self.items & IT_FUEL_REGEN != 0), maxf, cvar("g_balance_fuel_rot"), cvar("g_balance_fuel_rotlinear"), rot_mod * frametime * (time > self.pauserotfuel_finished), limitf);
 }
 
 float zoomstate_set;

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-09-01 10:04:55 UTC (rev 7581)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-09-01 13:14:03 UTC (rev 7582)
@@ -935,6 +935,7 @@
         warmup_start_ammo_nails = start_ammo_nails;
         warmup_start_ammo_rockets = start_ammo_rockets;
         warmup_start_ammo_cells = start_ammo_cells;
+        warmup_start_ammo_fuel = start_ammo_fuel;
         warmup_start_health = start_health;
         warmup_start_armorvalue = start_armorvalue;
         warmup_start_weapons = start_weapons;
@@ -947,6 +948,7 @@
                 warmup_start_ammo_cells = cvar("g_warmup_start_ammo_cells");
                 warmup_start_ammo_nails = cvar("g_warmup_start_ammo_nails");
                 warmup_start_ammo_rockets = cvar("g_warmup_start_ammo_rockets");
+                warmup_start_ammo_fuel = cvar("g_warmup_start_ammo_fuel");
             }
             warmup_start_health = cvar("g_warmup_start_health");
             warmup_start_armorvalue = cvar("g_warmup_start_armor");
@@ -972,6 +974,7 @@
         g_grappling_hook = 0; // these two can't coexist, as they use the same button
         start_items |= IT_FUEL_REGEN;
         start_ammo_fuel = max(start_ammo_fuel, cvar("g_balance_fuel_rotstable"));
+        warmup_start_ammo_fuel = max(warmup_start_ammo_fuel, cvar("g_balance_fuel_rotstable"));
     }
 
     if (g_jetpack)