Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

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

diff --git a/qcsrc/csqcmodellib/interpolate.qc b/qcsrc/csqcmodellib/interpolate.qc
index ac0ba6e7d70ac7cb56fbc8673a4abec027b513b9..2ed78fbd8c3b92247ecae15a36525358e9a2f7f7 100644 (file)
--- a/qcsrc/csqcmodellib/interpolate.qc
+++ b/qcsrc/csqcmodellib/interpolate.qc
@@ -50,6 +50,10 @@ void InterpolateOrigin_Note()
                if(self.iorigin2 != self.iorigin1)
                        self.angles = vectoangles(self.iorigin2 - self.iorigin1);
 
+       if(self.iflags & IFLAG_AUTOVELOCITY)
+               if(self.itime2 != self.itime1)
+                       self.velocity = (self.iorigin2 - self.iorigin1) * (1.0 / (self.itime2 - self.itime1));
+
        if(self.iflags & IFLAG_ANGLES)
        {
                fixedmakevectors(self.angles);
@@ -116,7 +120,7 @@ void InterpolateOrigin_Do()
 }
 void InterpolateOrigin_Undo()
 {
-       self.origin = self.iorigin2;
+       setorigin(self, self.iorigin2);
        if(self.iflags & IFLAG_ANGLES)
                self.angles = fixedvectoangles2(self.iforward2, self.iup2);
        if(self.iflags & IFLAG_VELOCITY)