r2295 - branches/nexuiz-2.0/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Apr 8 10:35:12 EDT 2007


Author: div0
Date: 2007-04-08 10:35:11 -0400 (Sun, 08 Apr 2007)
New Revision: 2295

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
Log:
more hook updates; less dlight


Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2007-04-08 14:34:03 UTC (rev 2294)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2007-04-08 14:35:11 UTC (rev 2295)
@@ -204,6 +204,7 @@
 			self.model = "";
 	}
 	self.effects = self.owner.effects;
+	self.effects = self.effects - (self.effects & (EF_BLUE | EF_RED)); // eat performance
 	if(self.owner.alpha >= 0)
 		self.alpha = self.owner.alpha;
 	else

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2007-04-08 14:34:03 UTC (rev 2294)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2007-04-08 14:35:11 UTC (rev 2295)
@@ -60,6 +60,8 @@
 		pl.movetype = MOVETYPE_WALK;
 
 	pl.hook_time = time + 0.0;
+
+	//pl.disableclientprediction = FALSE;
 }
 
 void GrapplingHookThink()
@@ -72,7 +74,7 @@
 		return;
 	}
 
-	self.nextthink = time + 0.1;
+	self.nextthink = time;
 
 	makevectors(self.owner.v_angle);
 	org = self.owner.origin + self.owner.view_ofs + v_forward * 15 - v_right * 5 + v_up * -12;
@@ -112,13 +114,13 @@
 			newlength = self.rope_length;
 
 			// first pull the rope...
-			newlength = max(newlength - pullspeed * 0.1, minlength);
+			newlength = max(newlength - pullspeed * frametime, minlength);
 
 			if(newlength < dist - ropestretch) // overstretched?
 			{
 				newlength = dist - ropestretch;
 				if(self.owner.velocity * dir < 0) // only if not already moving in hook direction
-					self.owner.velocity = self.owner.velocity + 0.1 * dir * rubberforce_overstretch;
+					self.owner.velocity = self.owner.velocity + frametime * dir * rubberforce_overstretch;
 			}
 
 			if(!self.owner.button5) // crouch key = don't pull
@@ -126,8 +128,8 @@
 
 			// then pull the player
 			spd = bound(0, (dist - self.rope_length) / ropestretch, 1);
-			self.owner.velocity = self.owner.velocity * (1 - 0.1 * ropeairfriction);
-			self.owner.velocity = self.owner.velocity + 0.1 * dir * spd * rubberforce;
+			self.owner.velocity = self.owner.velocity * (1 - frametime * ropeairfriction);
+			self.owner.velocity = self.owner.velocity + frametime * dir * spd * rubberforce;
 		}
 		else
 		{
@@ -175,11 +177,13 @@
 
 	self.state = 1;
 	self.think = GrapplingHookThink;
-	self.nextthink = time + 0.1;
+	self.nextthink = time;
 	self.touch = SUB_Null;
 	self.velocity = '0 0 0';
 	self.movetype = MOVETYPE_NONE;
 	self.rope_length = -1;
+
+	//self.owner.disableclientprediction = TRUE;
 }
 
 void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)




More information about the nexuiz-commits mailing list