Merge branch 'TimePath/experiments/csqc_prediction' into Mario/qc_physics

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

diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc
index 73025f1f61004ed50996fc1dfa692aafac943895..6f8f0f487e0c7e811cd425d7ceb9da8dcc93ec63 100644 (file)
--- a/qcsrc/server/antilag.qc
+++ b/qcsrc/server/antilag.qc
@@ -1,23 +1,26 @@
-#define ANTILAG_MAX_ORIGINS 64
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include "../dpdefs/progsdefs.qh"
+    #include "../dpdefs/dpextensions.qh"
+    #include "vehicles/vehicles_def.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);
 
@@ -37,9 +40,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;
@@ -48,7 +49,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;
@@ -106,7 +107,7 @@ void antilag_takeback(entity e, float t)
                e.antilag_saved_origin = e.origin;
 
        setorigin(e, antilag_takebackorigin(e, t));
-       e.antilag_takenback = TRUE;
+       e.antilag_takenback = true;
 }
 
 void antilag_restore(entity e)
@@ -121,7 +122,7 @@ 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)