[nexuiz-commits] r7583 - in branches/nexuiz-2.0: . data/qcsrc/client data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Tue Sep 1 09:30:48 EDT 2009


Author: div0
Date: 2009-09-01 09:30:48 -0400 (Tue, 01 Sep 2009)
New Revision: 7583

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/client/modeleffects.qc
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
   branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
   branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc
Log:
r7580 | div0 | 2009-09-01 03:01:01 -0400 (Tue, 01 Sep 2009) | 2 lines
modeleffects: also network skin
r7581 | tzork | 2009-09-01 06:04:55 -0400 (Tue, 01 Sep 2009) | 1 line
 <div0> add a 0 as second argument then commit
r7582 | div0 | 2009-09-01 09:14:03 -0400 (Tue, 01 Sep 2009) | 2 lines
do not rot/regen fuel when using unlimited ammo


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-09-01 13:14:03 UTC (rev 7582)
+++ branches/nexuiz-2.0/.patchsets	2009-09-01 13:30:48 UTC (rev 7583)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7563,7565-7577
+revisions_applied = 1-7563,7565-7582

Modified: branches/nexuiz-2.0/data/qcsrc/client/modeleffects.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/modeleffects.qc	2009-09-01 13:14:03 UTC (rev 7582)
+++ branches/nexuiz-2.0/data/qcsrc/client/modeleffects.qc	2009-09-01 13:30:48 UTC (rev 7583)
@@ -32,6 +32,7 @@
 	e.classname = "modeleffect";
 	e.model = "from network";
 	e.modelindex = ReadShort();
+	e.skin = ReadByte();
 	e.frame = ReadByte();
 	e.frame1time = time;
 	e.origin_x = ReadCoord();

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-09-01 13:14:03 UTC (rev 7582)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-09-01 13:30:48 UTC (rev 7583)
@@ -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: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2009-09-01 13:14:03 UTC (rev 7582)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2009-09-01 13:30:48 UTC (rev 7583)
@@ -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)
@@ -2484,6 +2487,7 @@
 	
 	WriteByte(MSG_ENTITY, f);
 	WriteShort(MSG_ENTITY, self.modelindex);
+	WriteByte(MSG_ENTITY, self.skin);
 	WriteByte(MSG_ENTITY, self.frame);
 	WriteCoord(MSG_ENTITY, self.origin_x);
 	WriteCoord(MSG_ENTITY, self.origin_y);
@@ -2515,7 +2519,7 @@
 	return TRUE;
 }
 
-void modeleffect_spawn(string m, float f, vector o, vector v, vector ang, vector angv, float s0, float s2, float a, float t1, float t2)
+void modeleffect_spawn(string m, float s, float f, vector o, vector v, vector ang, vector angv, float s0, float s2, float a, float t1, float t2)
 {
 	entity e;
 	float sz;
@@ -2530,6 +2534,7 @@
 	e.alpha = a;
 	e.teleport_time = t1;
 	e.fade_time = t2;
+	e.skin = s;
 	if(s0 >= 0)
 		e.scale = s0 / max6(-e.mins_x, -e.mins_y, -e.mins_z, e.maxs_x, e.maxs_y, e.maxs_z);
 	else
@@ -2545,5 +2550,5 @@
 
 void shockwave_spawn(string m, vector org, float sz, float t1, float t2)
 {
-	return modeleffect_spawn(m, 0, org, '0 0 0', '0 0 0', '0 0 0', 0, sz, 1, t1, t2);
+	return modeleffect_spawn(m, 0, 0, org, '0 0 0', '0 0 0', '0 0 0', 0, sz, 1, t1, t2);
 }

Modified: branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc	2009-09-01 13:14:03 UTC (rev 7582)
+++ branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc	2009-09-01 13:30:48 UTC (rev 7583)
@@ -402,7 +402,7 @@
 
 void onslaught_generator_ring_spawn(vector org)
 {
-	modeleffect_spawn("models/onslaught/shockwavetransring.md3", 0, org, '0 0 0', '0 0 0', '0 0 0', 0, -16, 0.1, 1.25, 0.25);
+	modeleffect_spawn("models/onslaught/shockwavetransring.md3", 0, 0, org, '0 0 0', '0 0 0', '0 0 0', 0, -16, 0.1, 1.25, 0.25);
 };
 
 void onslaught_generator_ray_think()



More information about the nexuiz-commits mailing list