From: Samual Lenks <samual@xonotic.org>
Date: Wed, 26 Feb 2014 23:39:26 +0000 (-0500)
Subject: Switch back to previous last origin method
X-Git-Tag: xonotic-v0.8.0~152^2~52
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9fb8ade37ed317a3920fb8aa1636809d83fb9aab;p=xonotic%2Fxonotic-data.pk3dir.git

Switch back to previous last origin method
---

diff --git a/qcsrc/client/particles.qc b/qcsrc/client/particles.qc
index 74660ebf9..0e4e2b887 100644
--- a/qcsrc/client/particles.qc
+++ b/qcsrc/client/particles.qc
@@ -422,8 +422,8 @@ void Draw_ArcBeam_callback(vector start, vector hit, vector end)
 	// draw primary beam render
 	vector top    = hitorigin + (thickdir * thickness);
 	vector bottom = hitorigin - (thickdir * thickness);
-	vector last_top    = start + (thickdir * Draw_ArcBeam_callback_last_thickness);
-	vector last_bottom = start - (thickdir * Draw_ArcBeam_callback_last_thickness);
+	//vector last_top    = start + (thickdir * Draw_ArcBeam_callback_last_thickness);
+	//vector last_bottom = start - (thickdir * Draw_ArcBeam_callback_last_thickness);
 
 	R_BeginPolygon(beam.beam_image, DRAWFLAG_NORMAL); // DRAWFLAG_ADDITIVE
 	R_PolygonVertex(
@@ -433,13 +433,13 @@ void Draw_ArcBeam_callback(vector start, vector hit, vector end)
 		beam.beam_alpha
 	);
 	R_PolygonVertex(
-		last_top,
+		Draw_ArcBeam_callback_last_top,
 		'0 0.5 0' + ('0 0.5 0' * (Draw_ArcBeam_callback_last_thickness / beam.beam_thickness)),
 		beam.beam_color,
 		beam.beam_alpha
 	);
 	R_PolygonVertex(
-		last_bottom,
+		Draw_ArcBeam_callback_last_bottom,
 		'0 0.5 0' * (1 - (Draw_ArcBeam_callback_last_thickness / beam.beam_thickness)),
 		beam.beam_color,
 		beam.beam_alpha
@@ -693,6 +693,8 @@ void Draw_ArcBeam()
 			Draw_ArcBeam_callback
 		);
 
+		//printf("segment: %d, warpzone transform: %d\n", i, (WarpZone_trace_transform != world));
+
 		// WEAPONTODO:
 		// Figure out some way to detect a collision with geometry with callback...
 		// That way we can know when we are done drawing the beam and skip