X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fwarpzonelib%2Fcommon.qc;h=0eaaac980c69a3e70cf0ba8974994741776f8507;hp=0734811c181108981470782c4fe31fd929c15188;hb=ceb30359c438be5c6c6257d65e92191431465e1a;hpb=fbb96108e5828a7557694db4469c2d0d7c582846

diff --git a/qcsrc/warpzonelib/common.qc b/qcsrc/warpzonelib/common.qc
index 0734811c18..0eaaac980c 100644
--- a/qcsrc/warpzonelib/common.qc
+++ b/qcsrc/warpzonelib/common.qc
@@ -5,7 +5,7 @@
     #include "../server/t_items.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../common/weapons/weapons.qh"
+    #include "../common/weapons/all.qh"
     #include "../dpdefs/dpextensions.qh"
 	#include "../dpdefs/progsdefs.qh"
 #endif
@@ -43,7 +43,7 @@ void WarpZone_Accumulator_AddInverse(entity acc, entity wz)
 .vector(vector, vector) camera_transform;
 float autocvar_cl_warpzone_usetrace = 1;
 vector WarpZone_camera_transform(vector org, vector ang)
-{
+{SELFPARAM();
 	vector vf, vr, vu;
 	if(self.warpzone_fadestart)
 		if(vlen(org - self.origin - 0.5 * (self.mins + self.maxs)) > self.warpzone_fadeend + 400)
@@ -81,7 +81,7 @@ void WarpZone_SetUp(entity e, vector my_org, vector my_ang, vector other_org, ve
 }
 
 vector WarpZone_Camera_camera_transform(vector org, vector ang)
-{
+{SELFPARAM();
 	// a fixed camera view
 	if(self.warpzone_fadestart)
 		if(vlen(org - self.origin - 0.5 * (self.mins + self.maxs)) > self.warpzone_fadeend + 400)
@@ -116,7 +116,7 @@ float WarpZoneLib_BoxTouchesBrush_Recurse()
 #ifdef CSQC
 	if (trace_networkentity)
 	{
-		dprint("hit a network ent, cannot continue WarpZoneLib_BoxTouchesBrush\n");
+		LOG_TRACE("hit a network ent, cannot continue WarpZoneLib_BoxTouchesBrush\n");
 		// we cannot continue, as a player blocks us...
 		// so, abort
 		return 0;
@@ -276,7 +276,7 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
 	{
 		if(--i < 1)
 		{
-			dprint("Too many warpzones in sequence, aborting trace.\n");
+			LOG_TRACE("Too many warpzones in sequence, aborting trace.\n");
 			trace_ent = world;
 			break;
 		}
@@ -304,7 +304,7 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
 		if(trace_ent == wz)
 		{
 			// FIXME can this check be removed? Do we really need it?
-			dprint("I transformed into the same zone again, wtf, aborting the trace\n");
+			LOG_TRACE("I transformed into the same zone again, wtf, aborting the trace\n");
 			trace_ent = world;
 			break;
 		}
@@ -399,7 +399,7 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
 	{
 		if(--i < 1)
 		{
-			dprint("Too many warpzones in sequence, aborting trace.\n");
+			LOG_TRACE("Too many warpzones in sequence, aborting trace.\n");
 			trace_ent = world;
 			break;
 		}
@@ -417,7 +417,7 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
 		if(trace_ent == wz)
 		{
 			// FIXME can this check be removed? Do we really need it?
-			dprint("I transformed into the same zone again, wtf, aborting the trace\n");
+			LOG_TRACE("I transformed into the same zone again, wtf, aborting the trace\n");
 			trace_ent = world;
 			break;
 		}
@@ -573,6 +573,43 @@ vector WarpZoneLib_NearestPointOnBox(vector mi, vector ma, vector org)
 	return nearest;
 }
 
+bool WarpZoneLib_BadEntity(entity e)
+{
+	string myclassname = e.classname;
+	if (e.instanceOfObject) return true;
+	switch(myclassname)
+	{
+		case "deathtype":
+		case "weaponentity":
+		case "exteriorweaponentity":
+		case "csqc_score_team":
+		case "pingplreport":
+		case "ent_client_scoreinfo":
+		case "saved_cvar_value":
+		case "accuracy":
+		case "entcs_sender":
+		case "entcs_receiver":
+		case "clientinit":
+		case "sprite_waypoint":
+		case "waypoint":
+		case "gibsplash":
+		//case "net_linked": // actually some real entities are linked without classname, fail
+		case "":
+			return true;
+	}
+
+	if(startsWith(myclassname, "msg_"))
+		return true;
+
+	if(startsWith(myclassname, "target_"))
+		return true;
+
+	if(startsWith(myclassname, "info_"))
+		return true;
+
+	return false;
+}
+
 .float WarpZone_findradius_hit;
 .entity WarpZone_findradius_next;
 void WarpZone_FindRadius_Recurse(vector org, float rad,        vector org0,               vector transform, vector shift, float needlineofsight)
@@ -591,6 +628,8 @@ void WarpZone_FindRadius_Recurse(vector org, float rad,        vector org0,
 
 	for(e = e0; e; e = e.chain)
 	{
+		if(WarpZoneLib_BadEntity(e))
+			continue;
 		p = WarpZoneLib_NearestPointOnBox(e.origin + e.mins, e.origin + e.maxs, org0);
 		if(needlineofsight)
 		{
@@ -626,6 +665,9 @@ void WarpZone_FindRadius_Recurse(vector org, float rad,        vector org0,
 	}
 	for(e = wz; e; e = e.WarpZone_findradius_next)
 	{
+		if(WarpZoneLib_BadEntity(e))
+			continue;
+
 		org0_new = WarpZone_TransformOrigin(e, org);
 		traceline(e.warpzone_targetorigin, org0_new, MOVE_NOMONSTERS, e);
 		org_new = trace_endpos;
@@ -654,7 +696,7 @@ entity WarpZone_FindRadius(vector org, float rad, float needlineofsight)
 
 .entity WarpZone_refsys;
 void WarpZone_RefSys_GC()
-{
+{SELFPARAM();
 	// garbage collect unused reference systems
 	self.nextthink = time + 1;
 	if(self.owner.WarpZone_refsys != self)
@@ -772,3 +814,64 @@ entity WarpZone_RefSys_SpawnSameRefSys(entity me)
 	WarpZone_RefSys_Copy(e, me);
 	return e;
 }
+
+float WarpZoneLib_ExactTrigger_Touch()
+{SELFPARAM();
+	return !WarpZoneLib_BoxTouchesBrush(other.absmin, other.absmax, self, other);
+}
+
+
+void WarpZoneLib_MoveOutOfSolid_Expand(entity e, vector by)
+{
+	float eps = 0.0625;
+	tracebox(e.origin, e.mins - '1 1 1' * eps, e.maxs + '1 1 1' * eps, e.origin + by, MOVE_WORLDONLY, e);
+	if (trace_startsolid)
+		return;
+	if (trace_fraction < 1)
+	{
+		// hit something
+		// adjust origin in the other direction...
+		setorigin(e,e.origin - by * (1 - trace_fraction));
+	}
+}
+
+float WarpZoneLib_MoveOutOfSolid(entity e)
+{
+	vector o, m0, m1;
+
+	o = e.origin;
+	traceline(o, o, MOVE_WORLDONLY, e);
+	if (trace_startsolid)
+		return false;
+
+	tracebox(o, e.mins, e.maxs, o, MOVE_WORLDONLY, e);
+	if (!trace_startsolid)
+		return true;
+
+	m0 = e.mins;
+	m1 = e.maxs;
+	e.mins = '0 0 0';
+	e.maxs = '0 0 0';
+	WarpZoneLib_MoveOutOfSolid_Expand(e, '1 0 0' * m0_x);
+	e.mins_x = m0_x;
+	WarpZoneLib_MoveOutOfSolid_Expand(e, '1 0 0' * m1_x);
+	e.maxs_x = m1_x;
+	WarpZoneLib_MoveOutOfSolid_Expand(e, '0 1 0' * m0_y);
+	e.mins_y = m0_y;
+	WarpZoneLib_MoveOutOfSolid_Expand(e, '0 1 0' * m1_y);
+	e.maxs_y = m1_y;
+	WarpZoneLib_MoveOutOfSolid_Expand(e, '0 0 1' * m0_z);
+	e.mins_z = m0_z;
+	WarpZoneLib_MoveOutOfSolid_Expand(e, '0 0 1' * m1_z);
+	e.maxs_z = m1_z;
+	setorigin(e, e.origin);
+
+	tracebox(e.origin, e.mins, e.maxs, e.origin, MOVE_WORLDONLY, e);
+	if (trace_startsolid)
+	{
+		setorigin(e, o);
+		return false;
+	}
+
+	return true;
+}