X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fantilag.qc;h=36734976c4c058e4c0bd0218bef674df624eeb03;hb=068324d293df795dbc41de75f38256b8c6c35607;hp=6f8f0f487e0c7e811cd425d7ceb9da8dcc93ec63;hpb=15a18e8ca7c55ac8187b9ea266d15c2d6e0cb869;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc
index 6f8f0f487..36734976c 100644
--- 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/vehicles_def.qh"
+    #include "../common/vehicles/all.qh"
     #include "antilag.qh"
 #endif
 
@@ -58,17 +56,10 @@ 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)
 {
-	float i0, i1;
-
-	i0 = antilag_find(e, t);
-	if(i0 < 0)
+	int i0 = antilag_find(e, t);
+	if (i0 < 0)
 	{
 		// IN THE PRESENT
 		if(e.antilag_takenback)
@@ -76,8 +67,8 @@ vector antilag_takebackorigin(entity e, float t)
 		else
 			return e.origin;
 	}
-	i1 = i0 + 1;
-	if(i1 >= ANTILAG_MAX_ORIGINS)
+	int i1 = i0 + 1;
+	if (i1 >= ANTILAG_MAX_ORIGINS)
 		i1 = 0;
 
 	return lerpv(e.(antilag_times[i0]), e.(antilag_origins[i0]), e.(antilag_times[i1]), e.(antilag_origins[i1]), t);
@@ -106,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;
 }
 
@@ -127,10 +119,8 @@ void antilag_restore(entity e)
 
 void antilag_clear(entity e)
 {
-	float i;
-
 	antilag_restore(e);
-	for(i = 0; i < ANTILAG_MAX_ORIGINS; ++i)
+	for (int i = 0; i < ANTILAG_MAX_ORIGINS; ++i)
 	{
 		e.(antilag_times[i]) = -2342;
 		e.(antilag_origins[i]) = e.origin;