Merge remote-tracking branch 'origin/TimePath/experiments/csqc_prediction' into TimeP...

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

diff --git a/qcsrc/csqcmodellib/interpolate.qc b/qcsrc/csqcmodellib/interpolate.qc
index c1626f816e3b395cb70fa9da1c0e07737ccb1ae0..5c8e1e31e62ce7d3af314b5116ce4f02eea24cbf 100644 (file)
--- a/qcsrc/csqcmodellib/interpolate.qc
+++ b/qcsrc/csqcmodellib/interpolate.qc
@@ -19,6 +19,16 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
+#if defined(CSQC)
+       #include "../dpdefs/csprogsdefs.qh"
+       #include "../client/defs.qh"
+       #include "../warpzonelib/anglestransform.qh"
+       #include "../client/autocvars.qh"
+       #include "interpolate.qh"
+       #include "cl_model.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
 
 .vector iorigin1, iorigin2;
 .vector ivelocity1, ivelocity2;
@@ -29,13 +39,13 @@
 .float itime1, itime2;
 void InterpolateOrigin_Reset()
 {
-       self.iflags &~= IFLAG_INTERNALMASK;
+       self.iflags &= ~IFLAG_INTERNALMASK;
        self.itime1 = self.itime2 = 0;
 }
 void InterpolateOrigin_Note()
 {
        float dt;
-       float f0;
+       int f0;
 
        dt = time - self.itime2;
 
@@ -95,7 +105,7 @@ void InterpolateOrigin_Note()
        else if(self.iflags & IFLAG_V_ANGLE_X)
        {
                self.ivforward1_x = self.ivforward2_x;
-               self.ivforward2_x = self.v_angle_x;
+               self.ivforward2_x = self.v_angle.x;
        }
 
        if(self.iflags & IFLAG_VELOCITY)
@@ -106,7 +116,7 @@ void InterpolateOrigin_Note()
 
        if(self.iflags & IFLAG_TELEPORTED)
        {
-               self.iflags &~= IFLAG_TELEPORTED;
+               self.iflags &= ~IFLAG_TELEPORTED;
                self.itime1 = self.itime2 = time; // don't lerp
        }
        else if(vlen(self.iorigin2 - self.iorigin1) > 1000)