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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-13 06:35:06 -0400 (Mon, 13 Apr 2009)
New Revision: 6480

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/cl_player.qc
   trunk/data/qcsrc/server/defs.qh
Log:
leave the "oldorigin" field on player entities alone, so SV_CheckStuck manages it alone
this fixes issues where you can fall through the map at high netfps


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-04-13 10:21:23 UTC (rev 6479)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-04-13 10:35:06 UTC (rev 6480)
@@ -548,7 +548,7 @@
 	self.view_ofs = PL_VIEW_OFS;
 	setorigin (self, spot.origin);
 	setsize (self, '0 0 0', '0 0 0');
-	self.oldorigin = self.origin;
+	self.prevorigin = self.origin;
 	self.items = 0;
 	self.weapons = 0;
 	self.model = "";
@@ -836,6 +836,7 @@
 		setorigin (self, spot.origin + '0 0 1' * (1 - self.mins_z - 24));
 		// don't reset back to last position, even if new position is stuck in solid
 		self.oldorigin = self.origin;
+		self.prevorigin = self.origin;
 
 		if(g_arena)
 		{
@@ -2318,7 +2319,7 @@
 			vector dist;
 
 			// calculate player movement (in 2 dimensions only, so jumping on one spot doesn't count as movement)
-			dist = self.oldorigin - self.origin;
+			dist = self.prevorigin - self.origin;
 			dist_z = 0;
 			self.lms_traveled_distance += fabs(vlen(dist));
 
@@ -2343,7 +2344,7 @@
 			}
 		}
 
-		self.oldorigin = self.origin;
+		self.prevorigin = self.origin;
 
 		if ((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss)
 		{

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-04-13 10:21:23 UTC (rev 6479)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-04-13 10:35:06 UTC (rev 6480)
@@ -60,7 +60,7 @@
 	//self.weapon = oldself.weapon;
 	setorigin(self, oldself.origin);
 	setsize(self, oldself.mins, oldself.maxs);
-	self.oldorigin = oldself.origin;
+	self.prevorigin = oldself.origin;
 	self.reset = SUB_Remove;
 
 	Drag_MoveDrag(oldself, self);

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2009-04-13 10:21:23 UTC (rev 6479)
+++ trunk/data/qcsrc/server/defs.qh	2009-04-13 10:35:06 UTC (rev 6480)
@@ -560,3 +560,5 @@
 .entity soundentity;
 
 .float ammo_fuel;
+
+.vector prevorigin;