add EF_TELEPORT_BIT support too

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / interpolate.qc

diff --git a/qcsrc/client/interpolate.qc b/qcsrc/client/interpolate.qc
index 3d6a1033a130f86eb62fb420171ad3a851e55677..a3140c8e775d1ebce3af9cb1f5d85700ca37f695 100644 (file)
--- a/qcsrc/client/interpolate.qc
+++ b/qcsrc/client/interpolate.qc
@@ -52,26 +52,28 @@ void InterpolateOrigin_Note()
                self.ivelocity2 = self.velocity;
        }
 
-       if(vlen(self.iorigin2 - self.iorigin1) > 1000)
+       if(self.iflags & IFLAG_TELEPORTED)
        {
+               self.iflags &~= IFLAG_TELEPORTED;
                self.itime1 = self.itime2 = time; // don't lerp
        }
-
-       if((self.iflags & IFLAG_VELOCITY) && (vlen(self.ivelocity2 - self.ivelocity1) > 1000))
+       else if(vlen(self.iorigin2 - self.iorigin1) > 1000)
        {
                self.itime1 = self.itime2 = time; // don't lerp
        }
-
-       if(dt < 0.2)
+       else if((self.iflags & IFLAG_VELOCITY) && (vlen(self.ivelocity2 - self.ivelocity1) > 1000))
        {
-               self.itime1 = serverprevtime;
-               self.itime2 = time;
+               self.itime1 = self.itime2 = time; // don't lerp
        }
-       else
+       else if(dt >= 0.2)
        {
-               // don't lerp
                self.itime1 = self.itime2 = time;
        }
+       else
+       {
+               self.itime1 = serverprevtime;
+               self.itime2 = time;
+       }
 }
 void InterpolateOrigin_Do()
 {