Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / antilag.qc

diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc
index 8b1dc6de1dbd637c622879cca3007e3462a519b3..8a628a1bea91e1c5f9e5d5158b176b3eeedfad91 100644 (file)
--- a/qcsrc/server/antilag.qc
+++ b/qcsrc/server/antilag.qc
@@ -49,7 +49,7 @@ float antilag_find(entity e, float t)
        return -1;
 }
 
-vector lerp(float t0, vector v0, float t1, vector v1, float t)
+vector lerpv(float t0, vector v0, float t1, vector v1, float t)
 {
        return v0 + (v1 - v0) * ((t - t0) / (t1 - t0));
 }
@@ -69,7 +69,17 @@ vector antilag_takebackorigin(entity e, float t)
        if(i1 >= ANTILAG_MAX_ORIGINS)
                i1 = 0;
 
-       return lerp(e.(antilag_times[i0]), e.(antilag_origins[i0]), e.(antilag_times[i1]), e.(antilag_origins[i1]), t);
+       return lerpv(e.(antilag_times[i0]), e.(antilag_origins[i0]), e.(antilag_times[i1]), e.(antilag_origins[i1]), t);
+}
+
+vector antilag_takebackavgvelocity(entity e, float t0, float t1)
+{
+       vector o0, o1;
+       if(t0 >= t1)
+               return '0 0 0';
+       o0 = antilag_takebackorigin(e, t0);
+       o1 = antilag_takebackorigin(e, t1);
+       return (o1 - o0) * (1 / (t1 - t0));
 }
 
 void antilag_takeback(entity e, float t)