From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 25 Oct 2011 08:53:46 +0000 (+0200)
Subject: Revert "Vehicle antilag"
X-Git-Tag: xonotic-v0.6.0~35^2~81^2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9d67ffa58193394ee1bebb138abf61a5852b26f5;p=xonotic%2Fxonotic-data.pk3dir.git

Revert "Vehicle antilag"

This reverts commit 6bc4bcbfd12aa53b22fef9f8de202f11151dfc13.
---

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index a908353a4..6a62d61b5 100644
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -391,12 +391,7 @@ void tracebox_antilag_force_wz (entity source, vector v1, vector mi, vector ma,
 		// take players back into the past
 		FOR_EACH_PLAYER(player)
 			if(player != forent)
-			{
-			    antilag_takeback(player, time - lag);
-			    if(player.vehicle)
-                    antilag_takeback(player.vehicle, time - lag);
-			}
-				
+				antilag_takeback(player, time - lag);
 	}
 
 	// do the trace
@@ -410,12 +405,7 @@ void tracebox_antilag_force_wz (entity source, vector v1, vector mi, vector ma,
 	{
 		FOR_EACH_PLAYER(player)
 			if(player != forent)
-			{
-			    antilag_restore(player);
-			    if(player.vehicle)
-                    antilag_restore(player.vehicle);
-			}
-				
+				antilag_restore(player);
 	}
 
 	// restore shooter solid type
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 6d60fd8c0..d6a39859e 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -2852,8 +2852,6 @@ void EndFrame()
 		self.hitsound = FALSE;
 		self.typehitsound = FALSE;
 		antilag_record(self, altime);
-		if(self.vehicle)
-            antilag_record(self.vehicle, altime);
 	}
 }
 
diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index 759502743..e3c74c5e1 100644
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -273,9 +273,10 @@ float racer_frame()
         return 1;
     }
 
-    
     racer_align4point();
-    vh_crosshair_trace(player);
+
+    crosshair_trace(player);
+
     racer.angles_x *= -1;
 
     // Yaw
diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index 4712777ee..201c186c3 100644
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -344,7 +344,7 @@ float raptor_frame()
         player.BUTTON_ATCK = player.BUTTON_ATCK2 = 0;
         return 1;
     }
-    vh_crosshair_trace(player);
+    crosshair_trace(player);
 
     vector vang;
     vang = raptor.angles;
diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc
index 00e8f3382..f43ec08e5 100644
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@ -145,7 +145,7 @@ void spiderbot_rocket_do()
     if not (self.owner.BUTTON_ATCK2)
         return;
 
-    vh_crosshair_trace(self.owner);
+    crosshair_trace(self.owner);
 
     v = gettaginfo(self.tur_head,gettagindex(self.tur_head,"tag_fire"));
     rocket = vehicles_projectile("spiderbot_rocket_launch", "weapons/rocket_fire.wav",
diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 051a9136e..c4e287538 100644
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -111,40 +111,6 @@ void CSQCVehicleSetup(entity own, float vehicle_id)
     dont before calling.
 
 **/
-void vh_crosshair_trace(entity player)
-{
-    float lag; 
-    entity pl;
-    
-    lag = ANTILAG_LATENCY(self);
-    if(lag < 0.001)
-        lag = 0;
-    if(clienttype(self) != CLIENTTYPE_REAL)
-        lag = 0;
-    if(autocvar_g_antilag == 0 || self.cvar_cl_noantilag)
-        lag = 0; // only do hitscan, but no antilag
-
-    if(lag)
-        FOR_EACH_PLAYER(pl)
-            if(pl != self)
-            {
-                antilag_takeback(pl, time - lag);
-                if(pl.vehicle)
-                    antilag_takeback(pl.vehicle, time - lag);
-
-            }
-
-    crosshair_trace(player);
-
-    if(lag)
-        FOR_EACH_PLAYER(pl)
-            if(pl != self)
-            {
-                antilag_restore(pl);
-                if(pl.vehicle)
-                    antilag_restore(pl.vehicle);
-            }
-}
 .entity lock_target;
 .float  lock_strength;
 .float  lock_time;
@@ -178,7 +144,7 @@ void vehicles_locktarget(float incr, float decr, float _lock_time)
         if(trace_ent.deadflag != DEAD_NO)
             trace_ent = world;
 
-        if not (trace_ent.vehicle_flags & VHF_ISVEHICLE || trace_ent.turrcaps_flags & TFL_TURRCAPS_ISTURRET || trace_ent.classname == "player")
+        if not (trace_ent.vehicle_flags & VHF_ISVEHICLE || trace_ent.turrcaps_flags & TFL_TURRCAPS_ISTURRET)
             trace_ent = world;
     }
 
diff --git a/qcsrc/server/w_common.qc b/qcsrc/server/w_common.qc
index 00a9d2ed0..1a995191c 100644
--- a/qcsrc/server/w_common.qc
+++ b/qcsrc/server/w_common.qc
@@ -419,13 +419,7 @@ void fireBallisticBullet(vector start, vector dir, float spread, float pSpeed, f
 		if(lag)
 			FOR_EACH_PLAYER(pl)
 				if(pl != self)
-				{
-				    antilag_takeback(pl, time - lag);
-                    if(pl.vehicle)
-                        antilag_takeback(pl.vehicle, time - lag);
-
-				}
-					
+					antilag_takeback(pl, time - lag);
 
 		oldself = self;
 		self = proj;
@@ -504,12 +498,7 @@ void fireBallisticBullet(vector start, vector dir, float spread, float pSpeed, f
 		if(lag)
 			FOR_EACH_PLAYER(pl)
 				if(pl != self)
-				{
-				    antilag_restore(pl);
-				    if(pl.vehicle)
-                        antilag_restore(pl.vehicle);
-				}
-					
+					antilag_restore(pl);
 
 		remove(proj);