X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fantilag.qc;h=858e0ef8b152b433b6e92c896953cfe648f65801;hb=94d74449f36b5750f1d1450b02c3817f179211b1;hp=93ca6acf93eba5b7204c3dd0d4353a5b4a9901dd;hpb=139a594d29f65508e5d6001e90d4ee4fad82ca66;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc
index 93ca6acf9..858e0ef8b 100644
--- a/qcsrc/server/antilag.qc
+++ b/qcsrc/server/antilag.qc
@@ -1,13 +1,13 @@
 #include "antilag.qh"
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include <server/defs.qh>
-    #include <common/state.qh>
-    #include <common/vehicles/all.qh>
-	#include <lib/warpzone/common.qh>
-    #include "antilag.qh"
-#endif
+
+#include <common/monsters/sv_monsters.qh>
+#include <common/state.qh>
+#include <common/stats.qh>
+#include <common/vehicles/all.qh>
+#include <common/weapons/_all.qh>
+#include <lib/warpzone/common.qh>
+#include <server/antilag.qh>
+#include <server/weapons/common.qh>
 
 const int ANTILAG_MAX_ORIGINS = 64;
 .vector antilag_origins[ANTILAG_MAX_ORIGINS];
@@ -20,10 +20,10 @@ const int ANTILAG_MAX_ORIGINS = 64;
 
 void antilag_record(entity e, entity store, float t)
 {
-    if (e.vehicle) {
-        if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
-        antilag_record(e.vehicle, e.vehicle, t);
-    }
+	if (e.vehicle) {
+		if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
+		antilag_record(e.vehicle, e.vehicle, t);
+	}
 
 	if (time < store.antilag_times[store.antilag_index]) return;
 	store.antilag_index += 1;
@@ -86,9 +86,9 @@ vector antilag_takebackavgvelocity(entity e, entity store, float t0, float t1)
 void antilag_takeback(entity e, entity store, float t)
 {
 	if (e.vehicle) {
-	    if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
+		if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
 		antilag_takeback(e.vehicle, e.vehicle, t);
-    }
+	}
 
 	if (!store.antilag_takenback)
 		store.antilag_saved_origin = e.origin;
@@ -101,7 +101,7 @@ void antilag_takeback(entity e, entity store, float t)
 void antilag_restore(entity e, entity store)
 {
 	if (e.vehicle) {
-	    if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
+		if (e.vehicle.vehicle_flags == VHF_PLAYERSLOT) return;
 		antilag_restore(e.vehicle, e.vehicle);
 	}
 
@@ -151,7 +151,7 @@ void antilag_restore_all(entity ignore)
 float antilag_getlag(entity e)
 {
 	float lag = ((IS_REAL_CLIENT(e)) ? ANTILAG_LATENCY(e) : 0);
-	bool noantilag = ((IS_CLIENT(e)) ? CS(e).cvar_cl_noantilag : false);
+	bool noantilag = ((IS_CLIENT(e)) ? CS_CVAR(e).cvar_cl_noantilag : false);
 	if(autocvar_g_antilag == 0 || noantilag || lag < 0.001)
 		lag = 0;
 
@@ -202,14 +202,14 @@ void traceline_antilag_force (entity source, vector v1, vector v2, float nomonst
 }
 void traceline_antilag (entity source, vector v1, vector v2, float nomonst, entity forent, float lag)
 {
-	bool noantilag = ((IS_CLIENT(source)) ? CS(source).cvar_cl_noantilag : false);
+	bool noantilag = ((IS_CLIENT(source)) ? CS_CVAR(source).cvar_cl_noantilag : false);
 	if (autocvar_g_antilag != 2 || noantilag)
 		lag = 0;
 	traceline_antilag_force(source, v1, v2, nomonst, forent, lag);
 }
 void tracebox_antilag (entity source, vector v1, vector mi, vector ma, vector v2, float nomonst, entity forent, float lag)
 {
-	bool noantilag = ((IS_CLIENT(source)) ? CS(source).cvar_cl_noantilag : false);
+	bool noantilag = ((IS_CLIENT(source)) ? CS_CVAR(source).cvar_cl_noantilag : false);
 	if (autocvar_g_antilag != 2 || noantilag)
 		lag = 0;
 	tracebox_antilag_force_wz(source, v1, mi, ma, v2, nomonst, forent, lag, false);
@@ -220,14 +220,14 @@ void WarpZone_traceline_antilag_force (entity source, vector v1, vector v2, floa
 }
 void WarpZone_traceline_antilag (entity source, vector v1, vector v2, float nomonst, entity forent, float lag)
 {
-	bool noantilag = ((IS_CLIENT(source)) ? CS(source).cvar_cl_noantilag : false);
+	bool noantilag = ((IS_CLIENT(source)) ? CS_CVAR(source).cvar_cl_noantilag : false);
 	if (autocvar_g_antilag != 2 || noantilag)
 		lag = 0;
 	WarpZone_traceline_antilag_force(source, v1, v2, nomonst, forent, lag);
 }
 void WarpZone_tracebox_antilag (entity source, vector v1, vector mi, vector ma, vector v2, float nomonst, entity forent, float lag)
 {
-	bool noantilag = ((IS_CLIENT(source)) ? CS(source).cvar_cl_noantilag : false);
+	bool noantilag = ((IS_CLIENT(source)) ? CS_CVAR(source).cvar_cl_noantilag : false);
 	if (autocvar_g_antilag != 2 || noantilag)
 		lag = 0;
 	tracebox_antilag_force_wz(source, v1, mi, ma, v2, nomonst, forent, lag, true);