X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Ftracing.qc;h=157adb5d399c976dca3da949c257c272c3b182d3;hb=7de4aabaa02b98879bb4d7435c794ac79d1291fa;hp=475eb3d265c086e769242548ab018ed6a00e1bb3;hpb=f28bafd2da379d00bd179459e73a77620552a66f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index 475eb3d26..157adb5d3 100644
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -1,5 +1,7 @@
 #include "tracing.qh"
 
+#include <common/effects/all.qh>
+
 #include "accuracy.qh"
 #include "common.qh"
 #include "hitplot.qh"
@@ -28,7 +30,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, .entity weaponentity, vect
 	float oldsolid = ent.dphitcontentsmask;
 	if(!IS_CLIENT(ent))
 		antilag = false; // no antilag for non-clients!
-	if (IS_PLAYER(ent) && ent.(weaponentity).m_weapon == WEP_RIFLE)
+	if (IS_PLAYER(ent) && (ent.(weaponentity).m_weapon.spawnflags & WEP_FLAG_PENETRATEWALLS))
 		ent.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_CORPSE;
 	else
 		ent.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE;
@@ -84,7 +86,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, .entity weaponentity, vect
 	//vector prevend = w_shotend;
 
 	if (antilag)
-	if (!ent.cvar_cl_noantilag)
+	if (!CS(ent).cvar_cl_noantilag)
 	{
 		if (autocvar_g_antilag == 1) // switch to "ghost" if not hitting original
 		{
@@ -120,7 +122,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, .entity weaponentity, vect
 					if (trace_ent == CS(ent).cursor_trace_ent)
 						w_shotdir = normalize(CS(ent).cursor_trace_ent.origin - w_shotorg);
 					else
-						LOG_INFO("antilag fail\n");
+						LOG_INFO("antilag fail");
 				}
 			}
 		}
@@ -183,7 +185,7 @@ void W_SetupProjVelocity_Explicit(entity proj, vector dir, vector upDir, float p
 	#if 0
 	mspercallsum += gettime(GETTIME_HIRES);
 	mspercallcount += 1;
-	LOG_INFO("avg: ", ftos(mspercallcount / mspercallsum), " per sec\n");
+	LOG_INFO("avg: ", ftos(mspercallcount / mspercallsum), " per sec");
 	#endif
 
 	proj.velocity = W_CalculateProjectileVelocity(proj.owner, proj.owner.velocity, pSpeed * dir, forceAbsolute);
@@ -262,7 +264,7 @@ void FireRailgunBullet (entity this, .entity weaponentity, vector start, vector
 	// Find all non-hit players the beam passed close by
 	if(deathtype == WEP_VAPORIZER.m_id || deathtype == WEP_VORTEX.m_id)
 	{
-		FOREACH_CLIENT(IS_REAL_CLIENT(it) && it != this, LAMBDA(
+		FOREACH_CLIENT(IS_REAL_CLIENT(it) && it != this, {
 			if(!it.railgunhit)
 			if(!(IS_SPEC(it) && it.enemy == this))
 			{
@@ -278,7 +280,7 @@ void FireRailgunBullet (entity this, .entity weaponentity, vector start, vector
 					pseudoprojectile = spawn(); // we need this so the sound uses the "entchannel4" volume
 				soundtoat(MSG_ONE, pseudoprojectile, beampos, CH_SHOTS, SND(NEXWHOOSH_RANDOM()), VOL_BASE * f, ATTEN_NONE);
 			}
-		));
+		});
 
 		if(pseudoprojectile)
 			delete(pseudoprojectile);
@@ -351,16 +353,11 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo
 	float lag = ((IS_REAL_CLIENT(this)) ? ANTILAG_LATENCY(this) : 0);
 	if(lag < 0.001)
 		lag = 0;
-	if(autocvar_g_antilag == 0 || this.cvar_cl_noantilag)
+	bool noantilag = ((IS_CLIENT(this)) ? CS(this).cvar_cl_noantilag : false);
+	if(autocvar_g_antilag == 0 || noantilag)
 		lag = 0; // only do hitscan, but no antilag
 	if(lag)
-	{
-		FOREACH_CLIENT(IS_PLAYER(it) && it != this, antilag_takeback(it, CS(it), time - lag));
-		IL_EACH(g_monsters, it != this,
-		{
-			antilag_takeback(it, it, time - lag);
-		});
-	}
+		antilag_takeback_all(this, lag);
 
 	// change shooter to SOLID_BBOX so the shot can hit corpses
 	int oldsolid = this.dphitcontentsmask;
@@ -477,13 +474,7 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo
 	}
 
 	if(lag)
-	{
-		FOREACH_CLIENT(IS_PLAYER(it) && it != this, antilag_restore(it, CS(it)));
-		IL_EACH(g_monsters, it != this,
-		{
-			antilag_restore(it, it);
-		});
-	}
+		antilag_restore_all(this);
 
 	// restore shooter solid type
 	if(this)