[nexuiz-commits] r8716 - trunk/data/qcsrc/warpzonelib

[DONOTREPLY at icculus.org]

Author: div0
Date: 2010-02-28 14:44:48 -0500 (Sun, 28 Feb 2010)
New Revision: 8716

Modified:
   trunk/data/qcsrc/warpzonelib/TODO
   trunk/data/qcsrc/warpzonelib/common.qc
Log:
minor code cleanup; mark bug as todo

Modified: trunk/data/qcsrc/warpzonelib/TODO
===================================================================
--- trunk/data/qcsrc/warpzonelib/TODO	2010-02-28 19:44:41 UTC (rev 8715)
+++ trunk/data/qcsrc/warpzonelib/TODO	2010-02-28 19:44:48 UTC (rev 8716)
@@ -1,5 +1,6 @@
 Open issues:
 - grep for TODO and FIXME
+- when shot origin is inside warpzone, nex shot fails (and is even drawn in totally wrong direction). WHY? Possibly v_forward got lost?
 
 Weapon support:
 

Modified: trunk/data/qcsrc/warpzonelib/common.qc
===================================================================
--- trunk/data/qcsrc/warpzonelib/common.qc	2010-02-28 19:44:41 UTC (rev 8715)
+++ trunk/data/qcsrc/warpzonelib/common.qc	2010-02-28 19:44:48 UTC (rev 8716)
@@ -98,6 +98,8 @@
 	vf = v_forward;
 	vr = v_right;
 	vu = v_up;
+	o0 = org;
+	e0 = end;
 	// if starting in warpzone, first transform
 	wz = WarpZone_Find(org + mi, org + ma);
 	if(wz)
@@ -109,8 +111,6 @@
 		WarpZone_trace_v_angle = WarpZone_TransformVAngles(wz, WarpZone_trace_v_angle);
 	}
 	WarpZone_MakeAllSolid();
-	o0 = org;
-	e0 = end;
 	sol = -1;
 	frac = 0;
 	for(;;)
@@ -155,6 +155,8 @@
 	vf = v_forward;
 	vr = v_right;
 	vu = v_up;
+	o0 = org;
+	e0 = end;
 	// if starting in warpzone, first transform
 	wz = WarpZone_Find(org + mi, org + ma);
 	if(wz)
@@ -174,8 +176,6 @@
 		WarpZone_trace_v_angle = WarpZone_TransformVAngles(wz, WarpZone_trace_v_angle);
 	}
 	WarpZone_MakeAllSolid();
-	o0 = org;
-	e0 = end;
 	sol = -1;
 	frac = 0;
 	for(;;)
@@ -227,6 +227,8 @@
 	vf = v_forward;
 	vr = v_right;
 	vu = v_up;
+	v0 = e.velocity;
+	o0 = e.origin;
 	// if starting in warpzone, first transform
 	wz = WarpZone_Find(e.origin + e.mins, e.origin + e.maxs);
 	if(wz)
@@ -237,8 +239,6 @@
 	WarpZone_MakeAllSolid();
 	g = cvar("sv_gravity") * e.gravity;
 	WarpZone_tracetoss_time = 0;
-	v0 = e.velocity;
-	o0 = e.origin;
 	for(;;)
 	{
 		tracetoss(e, forent);