X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Ftracing.qc;h=f187b838b46fbdb256e4aeb5abdea8c4d9f2d24f;hb=35e8f712933b0ebf9b163b7289cf975825b33803;hp=02bd88a7664aec6708d9c10b5ec95bdef16db90e;hpb=983d0eb7da390a57706da39e31308b33133aeb9d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index 02bd88a76..f187b838b 100644
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -1,9 +1,24 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+	#include "../../dpdefs/progsdefs.qh"
+    #include "../../dpdefs/dpextensions.qh"
+    #include "../../warpzonelib/common.qh"
+    #include "../../common/constants.qh"
+    #include "../../common/util.qh"
+    #include "../../common/weapons/weapons.qh"
+    #include "tracing.qh"
+    #include "../autocvars.qh"
+    #include "../defs.qh"
+    #include "../antilag.qh"
+#endif
+
 // this function calculates w_shotorg and w_shotdir based on the weapon model
 // offset, trueaim and antilag, and won't put w_shotorg inside a wall.
 // make sure you call makevectors first (FIXME?)
 void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector mi, vector ma, float antilag, float recoil, string snd, float chan, float maxdamage, float range)
 {
-	float nudge = 1; // added to traceline target and subtracted from result
+	float nudge = 1; // added to traceline target and subtracted from result  TOOD(divVerent): do we still need this? Doesn't the engine do this now for us?
 	float oldsolid;
 	vector vecs, dv;
 	oldsolid = ent.dphitcontentsmask;
@@ -37,28 +52,32 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 
 	W_HitPlotAnalysis(ent, v_forward, v_right, v_up);
 
-	if(ent.weaponentity.movedir_x > 0)
+	if(ent.weaponentity.movedir.x > 0)
 		vecs = ent.weaponentity.movedir;
 	else
 		vecs = '0 0 0';
 
-	dv = v_right * -vecs_y + v_up * vecs_z;
+	dv = v_right * -vecs.y + v_up * vecs.z;
 	w_shotorg = ent.origin + ent.view_ofs + dv;
 
 	// now move the shotorg forward as much as requested if possible
 	if(antilag)
 	{
 		if(ent.antilag_debug)
-			tracebox_antilag(ent, w_shotorg, mi, ma, w_shotorg + v_forward * (vecs_x + nudge), MOVE_NORMAL, ent, ent.antilag_debug);
+			tracebox_antilag(ent, w_shotorg, mi, ma, w_shotorg + v_forward * (vecs.x + nudge), MOVE_NORMAL, ent, ent.antilag_debug);
 		else
-			tracebox_antilag(ent, w_shotorg, mi, ma, w_shotorg + v_forward * (vecs_x + nudge), MOVE_NORMAL, ent, ANTILAG_LATENCY(ent));
+			tracebox_antilag(ent, w_shotorg, mi, ma, w_shotorg + v_forward * (vecs.x + nudge), MOVE_NORMAL, ent, ANTILAG_LATENCY(ent));
 	}
 	else
-		tracebox(w_shotorg, mi, ma, w_shotorg + v_forward * (vecs_x + nudge), MOVE_NORMAL, ent);
+		tracebox(w_shotorg, mi, ma, w_shotorg + v_forward * (vecs.x + nudge), MOVE_NORMAL, ent);
 	w_shotorg = trace_endpos - v_forward * nudge;
 	// calculate the shotdir from the chosen shotorg
 	w_shotdir = normalize(w_shotend - w_shotorg);
 
+	//vector prevdir = w_shotdir;
+	//vector prevorg = w_shotorg;
+	//vector prevend = w_shotend; 
+
 	if (antilag)
 	if (!ent.cvar_cl_noantilag)
 	{
@@ -115,6 +134,9 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 
 	// nudge w_shotend so a trace to w_shotend hits
 	w_shotend = w_shotend + normalize(w_shotend - w_shotorg) * nudge;
+	//if(w_shotend != prevend) { printf("SERVER: shotEND differs: %s - %s\n", vtos(w_shotend), vtos(prevend)); }
+	//if(w_shotorg != prevorg) { printf("SERVER: shotORG differs: %s - %s\n", vtos(w_shotorg), vtos(prevorg)); }
+	//if(w_shotdir != prevdir) { printf("SERVER: shotDIR differs: %s - %s\n", vtos(w_shotdir), vtos(prevdir)); }
 }
 
 vector W_CalculateProjectileVelocity(vector pvelocity, vector mvelocity, float forceAbsolute)
@@ -139,7 +161,7 @@ void W_SetupProjVelocity_Explicit(entity proj, vector dir, vector upDir, float p
 		error("Unowned missile");
 
 	dir = dir + upDir * (pUpSpeed / pSpeed);
-	dir_z += pZSpeed / pSpeed;
+	dir.z += pZSpeed / pSpeed;
 	pSpeed *= vlen(dir);
 	dir = normalize(dir);
 
@@ -200,9 +222,9 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, f
 	while (1)
 	{
 		if(self.antilag_debug)
-			WarpZone_traceline_antilag (self, start, end, FALSE, o, self.antilag_debug);
+			WarpZone_traceline_antilag (self, start, end, false, o, self.antilag_debug);
 		else
-			WarpZone_traceline_antilag (self, start, end, FALSE, o, ANTILAG_LATENCY(self));
+			WarpZone_traceline_antilag (self, start, end, false, o, ANTILAG_LATENCY(self));
 		if(o && WarpZone_trace_firstzone)
 		{
 			o = world;
@@ -217,7 +239,7 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, f
 			break;
 
 		// make the entity non-solid so we can hit the next one
-		trace_ent.railgunhit = TRUE;
+		trace_ent.railgunhit = true;
 		trace_ent.railgunhitloc = end;
 		trace_ent.railgunhitsolidbackup = trace_ent.solid;
 		trace_ent.railgundistance = vlen(WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos) - start);
@@ -236,12 +258,12 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, f
 	endq3surfaceflags = trace_dphitq3surfaceflags;
 
 	// find all the entities the railgun hit and restore their solid state
-	ent = findfloat(world, railgunhit, TRUE);
+	ent = findfloat(world, railgunhit, true);
 	while (ent)
 	{
 		// restore their solid type
 		ent.solid = ent.railgunhitsolidbackup;
-		ent = findfloat(ent, railgunhit, TRUE);
+		ent = findfloat(ent, railgunhit, true);
 	}
 
 	// spawn a temporary explosion entity for RadiusDamage calls
@@ -274,7 +296,7 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, f
 	}
 
 	// find all the entities the railgun hit and hurt them
-	ent = findfloat(world, railgunhit, TRUE);
+	ent = findfloat(world, railgunhit, true);
 	while (ent)
 	{
 		// get the details we need to call the damage function
@@ -283,7 +305,7 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, f
 		f = ExponentialFalloff(mindist, maxdist, halflifedist, ent.railgundistance);
 		ffs = ExponentialFalloff(mindist, maxdist, forcehalflifedist, ent.railgundistance);
 
-		if(accuracy_isgooddamage(self.realowner, ent))
+		if(accuracy_isgooddamage(self, ent))
 			totaldmg += bdamage * f;
 
 		// apply the damage
@@ -296,11 +318,11 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, f
 
 		ent.railgunhitloc = '0 0 0';
 		ent.railgunhitsolidbackup = SOLID_NOT;
-		ent.railgunhit = FALSE;
+		ent.railgunhit = false;
 		ent.railgundistance = 0;
 
 		// advance to the next entity
-		ent = findfloat(ent, railgunhit, TRUE);
+		ent = findfloat(ent, railgunhit, true);
 	}
 
 	// calculate hits and fired shots for hitscan
@@ -346,16 +368,20 @@ void fireBullet(vector start, vector dir, float spread, float max_solid_penetrat
 	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);
+		FOR_EACH_MONSTER(pl)
+			antilag_takeback(pl, time - lag);
+	}
 
 	WarpZone_trace_forent = self;
 
-	for (;;)
+	for(0;;)
 	{
 		// TODO also show effect while tracing
-		WarpZone_TraceBox_ThroughZone(start, '0 0 0', '0 0 0', end, FALSE, WarpZone_trace_forent, world, fireBullet_trace_callback);
+		WarpZone_TraceBox_ThroughZone(start, '0 0 0', '0 0 0', end, false, WarpZone_trace_forent, world, fireBullet_trace_callback);
 		dir = WarpZone_TransformVelocity(WarpZone_trace_transform, dir);
 		end = WarpZone_TransformOrigin(WarpZone_trace_transform, end);
 		start = trace_endpos;
@@ -410,7 +436,7 @@ void fireBullet(vector start, vector dir, float spread, float max_solid_penetrat
 
 		// go through solid!
 		// outside the world? forget it
-		if(start_x > world.maxs_x || start_y > world.maxs_y || start_z > world.maxs_z || start_x < world.mins_x || start_y < world.mins_y || start_z < world.mins_z)
+		if(start.x > world.maxs.x || start.y > world.maxs.y || start.z > world.maxs.z || start.x < world.mins.x || start.y < world.mins.y || start.z < world.mins.z)
 			break;
 
 		float maxdist;
@@ -430,7 +456,7 @@ void fireBullet(vector start, vector dir, float spread, float max_solid_penetrat
 
 		// move the entity along its velocity until it's out of solid, then let it resume
 		// The previously hit entity is ignored here!
-		traceline_inverted (start, start + dir * maxdist, MOVE_NORMAL, WarpZone_trace_forent, TRUE, hit);
+		traceline_inverted (start, start + dir * maxdist, MOVE_NORMAL, WarpZone_trace_forent, true, hit);
 		if(trace_fraction == 1) // 1: we never got out of solid
 			break;
 
@@ -449,7 +475,11 @@ void fireBullet(vector start, vector dir, float spread, float max_solid_penetrat
 	}
 
 	if(lag)
+	{
 		FOR_EACH_PLAYER(pl)
 			if(pl != self)
 				antilag_restore(pl);
+		FOR_EACH_MONSTER(pl)
+			antilag_restore(pl);
+	}
 }