Merge branch 'terencehill/fuelregen_powerup' into 'master'

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

diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc
index f4fe2058b9790db8bba4c311597bb8940b6bb421..36734976c4c058e4c0bd0218bef674df624eeb03 100644 (file)
--- a/qcsrc/server/antilag.qc
+++ b/qcsrc/server/antilag.qc
@@ -1,9 +1,7 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "vehicles/vehicle.qh"
+    #include "../common/vehicles/all.qh"
     #include "antilag.qh"
 #endif
 
@@ -58,11 +56,6 @@ float antilag_find(entity e, float t)
        return -1;
 }
 
-vector lerpv(float t0, vector v0, float t1, vector v1, float t)
-{
-       return v0 + (v1 - v0) * ((t - t0) / (t1 - t0));
-}
-
 vector antilag_takebackorigin(entity e, float t)
 {
        int i0 = antilag_find(e, t);
@@ -104,7 +97,8 @@ void antilag_takeback(entity e, float t)
        if(!e.antilag_takenback)
                e.antilag_saved_origin = e.origin;
 
-       setorigin(e, antilag_takebackorigin(e, t));
+       vector org = antilag_takebackorigin(e, t);
+       setorigin(e, org);
        e.antilag_takenback = true;
 }