r5797 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-07 07:18:33 -0500 (Sat, 07 Feb 2009)
New Revision: 5797

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/client/interpolate.qc
   trunk/data/qcsrc/client/projectile.qc
Log:
fixing interpolation a bit


Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2009-02-07 10:43:23 UTC (rev 5796)
+++ trunk/data/qcsrc/client/Main.qc	2009-02-07 12:18:33 UTC (rev 5797)
@@ -723,7 +723,15 @@
 	// set up the "time" global for received entities to be correct for interpolation purposes
 	savetime = time;
 	if(servertime)
+	{
 		time = servertime;
+	}
+	else
+	{
+		serverprevtime = time;
+		serverdeltatime = getstatf(STAT_SYS_TICRATE) * getstatf(STAT_MOVEVARS_TIMESCALE);
+		time = serverprevtime + serverdeltatime;
+	}
 
 #ifdef DP_CSQC_ENTITY_REMOVE_IS_B0RKED
 	if(self.enttype)

Modified: trunk/data/qcsrc/client/interpolate.qc
===================================================================
--- trunk/data/qcsrc/client/interpolate.qc	2009-02-07 10:43:23 UTC (rev 5796)
+++ trunk/data/qcsrc/client/interpolate.qc	2009-02-07 12:18:33 UTC (rev 5797)
@@ -8,7 +8,7 @@
 {
 	float dt;
 
-	dt = time - self.itime1;
+	dt = time - self.itime2;
 
 	if(self.iflags & IFLAG_PREVALID)
 		self.iflags |= IFLAG_VALID;
@@ -48,8 +48,8 @@
 
 	if(dt < 0.2)
 	{
-		self.itime1 = time;
-		self.itime2 = time + getstatf(STAT_SYS_TICRATE) * getstatf(STAT_MOVEVARS_TIMESCALE);
+		self.itime1 = serverprevtime;
+		self.itime2 = time;
 	}
 	else
 	{

Modified: trunk/data/qcsrc/client/projectile.qc
===================================================================
--- trunk/data/qcsrc/client/projectile.qc	2009-02-07 10:43:23 UTC (rev 5796)
+++ trunk/data/qcsrc/client/projectile.qc	2009-02-07 12:18:33 UTC (rev 5797)
@@ -158,8 +158,6 @@
 {
 	float f;
 
-	InterpolateOrigin_Undo();
-
 	// projectile properties:
 	//   kind (interpolated, or clientside)
 	//