X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fantilag.qc;h=c53452ab78b352836a0614970259a54be27be59d;hb=2487070c23bdcfc8ac60d414356ec43f52ec1a57;hp=68ec68324d78f785ff84fde5167d7a44a0b1493a;hpb=737b9aa03c6796ac761630483cb5e9bf5ef56174;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc
index 68ec68324..36734976c 100644
--- a/qcsrc/server/antilag.qc
+++ b/qcsrc/server/antilag.qc
@@ -1,20 +1,24 @@
-#define ANTILAG_MAX_ORIGINS 64
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+    #include "../common/vehicles/all.qh"
+    #include "antilag.qh"
+#endif
+
+const int ANTILAG_MAX_ORIGINS = 64;
 .vector antilag_origins[ANTILAG_MAX_ORIGINS];
 .float antilag_times[ANTILAG_MAX_ORIGINS];
-.float antilag_index;
+.int antilag_index;
 .vector antilag_saved_origin;
 .float antilag_takenback;
 
 .float antilag_debug;
 
-void antilag_dummy()
-{
-	self.antilag_times = 0;
-	self.antilag_origins = '0 0 0';
-}
-
 void antilag_record(entity e, float t)
 {
+    if (e.vehicle && e.vehicle.vehicle_flags == VHF_PLAYERSLOT)
+        return;
+
     if(e.vehicle)
         antilag_record(e.vehicle, t);
 
@@ -34,9 +38,7 @@ void antilag_record(entity e, float t)
 // finds the index BEFORE t
 float antilag_find(entity e, float t)
 {
-	float i;
-
-	for(i = e.antilag_index; i > 0; --i)
+	for(int i = e.antilag_index; i > 0; --i)
 		if(e.(antilag_times[i]) >= t)
 			if(e.(antilag_times[i - 1]) < t)
 				return i - 1;
@@ -45,7 +47,7 @@ float antilag_find(entity e, float t)
 		if(e.(antilag_times[ANTILAG_MAX_ORIGINS - 1]) < t)
 			return ANTILAG_MAX_ORIGINS - 1;
 
-	for(i = ANTILAG_MAX_ORIGINS - 1; i > e.antilag_index + 1; --i)
+	for(int i = ANTILAG_MAX_ORIGINS - 1; i > e.antilag_index + 1; --i)
 		if(e.(antilag_times[i]) >= t)
 			if(e.(antilag_times[i - 1]) < t)
 				return i - 1;
@@ -54,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)
@@ -72,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);
@@ -92,18 +87,26 @@ vector antilag_takebackavgvelocity(entity e, float t0, float t1)
 
 void antilag_takeback(entity e, float t)
 {
+
+    if (e.vehicle && e.vehicle.vehicle_flags == VHF_PLAYERSLOT)
+        return;
+
 	if(e.vehicle)
 		antilag_takeback(e.vehicle, t);
 
 	if(!e.antilag_takenback)
 		e.antilag_saved_origin = e.origin;
 
-	setorigin(e, antilag_takebackorigin(e, t));
-	e.antilag_takenback = TRUE;
+	vector org = antilag_takebackorigin(e, t);
+	setorigin(e, org);
+	e.antilag_takenback = true;
 }
 
 void antilag_restore(entity e)
 {
+    if (e.vehicle && e.vehicle.vehicle_flags == VHF_PLAYERSLOT)
+        return;
+
 	if(e.vehicle)
 		antilag_restore(e.vehicle);
 
@@ -111,18 +114,16 @@ void antilag_restore(entity e)
 		return;
 
 	setorigin(e, e.antilag_saved_origin);
-	e.antilag_takenback = FALSE;
+	e.antilag_takenback = false;
 }
 
 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]) = self.origin;
+		e.(antilag_origins[i]) = e.origin;
 	}
 	e.antilag_index = ANTILAG_MAX_ORIGINS - 1; // next one is 0
 }