X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fwarpzonelib%2Fcommon.qc;h=f09f25bdcd13d320e5b9277da55795865d5c3e88;hb=616650bb18362024afeed71fed91d33dc1708d09;hp=3481ed175cccde39c00b561793e6a045be69e9f9;hpb=b3499b8b8d3cf35c151aa14f362fa9e777c27d97;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/warpzonelib/common.qc b/qcsrc/warpzonelib/common.qc
index 3481ed175..f09f25bdc 100644
--- a/qcsrc/warpzonelib/common.qc
+++ b/qcsrc/warpzonelib/common.qc
@@ -52,7 +52,7 @@ vector WarpZone_camera_transform(vector org, vector ang)
 
 void WarpZone_SetUp(entity e, vector my_org, vector my_ang, vector other_org, vector other_ang)
 {
-	e.warpzone_transform = AnglesTransform_Divide(other_ang, AnglesTransform_TurnDirectionFR(my_ang));
+	e.warpzone_transform = AnglesTransform_RightDivide(other_ang, AnglesTransform_TurnDirectionFR(my_ang));
 	e.warpzone_shift = AnglesTransform_PrePostShift_GetPostShift(my_org, e.warpzone_transform, other_org);
 	e.warpzone_origin = my_org;
 	e.warpzone_targetorigin = other_org;
@@ -191,6 +191,7 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
 	entity wz;
 	vector vf, vr, vu;
 
+	WarpZone_trace_forent = forent;
 	WarpZone_trace_firstzone = world;
 	WarpZone_trace_lastzone = world;
 	WarpZone_Trace_InitTransform();
@@ -206,7 +207,7 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
 		}
 		else
 		{
-			tracebox(org, mi, ma, end, nomonsters, forent);
+			tracebox(org, mi, ma, end, nomonsters, WarpZone_trace_forent);
 			if(cb)
 				cb(org, trace_endpos, end);
 			return;
@@ -229,8 +230,8 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
 			nomonsters_adjusted = nomonsters;
 			break;
 	}
-	if((contentshack = (forent.dphitcontentsmask && !(forent.dphitcontentsmask & DPCONTENTS_SOLID))))
-		BITSET_ASSIGN(forent.dphitcontentsmask, DPCONTENTS_SOLID);
+	if((contentshack = (WarpZone_trace_forent.dphitcontentsmask && !(WarpZone_trace_forent.dphitcontentsmask & DPCONTENTS_SOLID))))
+		BITSET_ASSIGN(WarpZone_trace_forent.dphitcontentsmask, DPCONTENTS_SOLID);
 
 	// if starting in warpzone, first transform
 	wz = WarpZone_Find(org + mi, org + ma);
@@ -262,7 +263,7 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
 			trace_ent = world;
 			break;
 		}
-		tracebox(org, mi, ma, end, nomonsters_adjusted, forent);
+		tracebox(org, mi, ma, end, nomonsters_adjusted, WarpZone_trace_forent);
 		if(cb)
 			cb(org, trace_endpos, end);
 		if(sol < 0)
@@ -273,7 +274,7 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
 			break;
 		if(trace_ent.classname != "trigger_warpzone")
 		{
-			if((nomonsters == MOVE_NOTHING) || ((nomonsters == MOVE_WORLDONLY) && trace_ent) || (contentshack && (trace_dphitcontents & forent.dphitcontentsmask) == DPCONTENTS_SOLID))
+			if((nomonsters == MOVE_NOTHING) || ((nomonsters == MOVE_WORLDONLY) && trace_ent) || (contentshack && (trace_dphitcontents & WarpZone_trace_forent.dphitcontentsmask) == DPCONTENTS_SOLID))
 			{
 				// continue the trace, ignoring this hit (we only care for warpzones)
 				org = trace_endpos + normalize(end - org);
@@ -300,11 +301,15 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end,
 		// we hit a warpzone... so, let's perform the trace after the warp again
 		org = WarpZone_TransformOrigin(wz, trace_endpos);
 		end = WarpZone_TransformOrigin(wz, end);
+
+		// we got warped, so let's step back a bit
+		tracebox(org, mi, ma, org + normalize(org - end) * 32, nomonsters_adjusted, WarpZone_trace_forent);
+		org = trace_endpos;
 	}
 	WarpZone_MakeAllOther();
 :fail
 	if(contentshack)
-		BITCLR_ASSIGN(forent.dphitcontentsmask, DPCONTENTS_SOLID);
+		BITCLR_ASSIGN(WarpZone_trace_forent.dphitcontentsmask, DPCONTENTS_SOLID);
 	trace_startsolid = sol;
 	v_forward = vf;
 	v_right = vr;
@@ -330,13 +335,14 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
 	o0 = e.origin;
 	v0 = e.velocity;
 
+	WarpZone_trace_forent = forent;
 	WarpZone_trace_firstzone = world;
 	WarpZone_trace_lastzone = world;
 	WarpZone_Trace_InitTransform();
 	WarpZone_tracetoss_time = 0;
 	if(!warpzone_warpzones_exist)
 	{
-		tracetoss(e, forent);
+		tracetoss(e, WarpZone_trace_forent);
 		if(cb)
 			cb(e.origin, trace_endpos, trace_endpos);
 		dt = vlen(e.origin - o0) / vlen(e.velocity);
@@ -380,12 +386,12 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
 			trace_ent = world;
 			break;
 		}
-		tracetoss(e, forent);
+		tracetoss(e, WarpZone_trace_forent);
 		if(cb)
 			cb(e.origin, trace_endpos, trace_endpos);
-		e.origin = trace_endpos;
-		dt = vlen(e.origin - o0) / vlen(e.velocity);
+		dt = vlen(trace_endpos - e.origin) / vlen(e.velocity);
 		WarpZone_tracetoss_time += dt;
+		e.origin = trace_endpos;
 		e.velocity_z -= dt * g;
 		if(trace_fraction >= 1)
 			break;
@@ -408,6 +414,14 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
 		// we hit a warpzone... so, let's perform the trace after the warp again
 		e.origin = WarpZone_TransformOrigin(wz, e.origin);
 		e.velocity = WarpZone_TransformVelocity(wz, e.velocity);
+
+		// we got warped, so let's step back a bit
+		e.velocity = -e.velocity;
+		tracetoss(e, WarpZone_trace_forent);
+		dt = vlen(trace_endpos - e.origin) / vlen(e.velocity);
+		WarpZone_tracetoss_time -= dt;
+		e.origin = trace_endpos;
+		e.velocity = -e.velocity;
 	}
 	WarpZone_MakeAllOther();
 :fail
@@ -663,7 +677,7 @@ void WarpZone_RefSys_AddIncrementally(entity me, entity ref)
 	t = AnglesTransform_Invert(me.WarpZone_refsys_incremental_transform);
 	s = AnglesTransform_PrePostShift_GetPostShift(me.WarpZone_refsys_incremental_shift, t, '0 0 0');
 	WarpZone_Accumulator_AddTransform(me.WarpZone_refsys, t, s);
-	WarpZone_Accumulator_Add(me.WarpZone_refsys, ref);
+	WarpZone_Accumulator_Add(me.WarpZone_refsys, ref.WarpZone_refsys);
 	me.WarpZone_refsys_incremental_shift = ref.WarpZone_refsys.warpzone_shift;
 	me.WarpZone_refsys_incremental_transform = ref.WarpZone_refsys.warpzone_transform;
 }