From: Samual Lenks Date: Thu, 27 Feb 2014 03:21:53 +0000 (-0500) Subject: Rename shothitpos to end_pos X-Git-Tag: xonotic-v0.8.0~152^2~43 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=dee7bcb3adbd8f648342d696292cbd3efc46c646;p=xonotic%2Fxonotic-data.pk3dir.git Rename shothitpos to end_pos --- diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index 48b16732d..a83b1be82 100644 --- a/qcsrc/common/weapons/w_arc.qc +++ b/qcsrc/common/weapons/w_arc.qc @@ -790,14 +790,14 @@ void Draw_ArcBeam(void) vf = view_forward; vr = view_right; vu = view_up; - vector shothitpos = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos); // warpzone support + vector end_pos = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos); view_forward = vf; view_right = vr; view_up = vu; // un-adjust trueaim if shotend is too close - if(vlen(shothitpos - view_origin) < g_trueaim_minrange) - shothitpos = view_origin + (view_forward * g_trueaim_minrange); + if(vlen(end_pos - view_origin) < g_trueaim_minrange) + end_pos = view_origin + (view_forward * g_trueaim_minrange); // move shot origin to the actual gun muzzle origin vector origin_offset = @@ -808,7 +808,7 @@ void Draw_ArcBeam(void) start_pos = start_pos + origin_offset; // calculate the aim direction now - wantdir = normalize(shothitpos - start_pos); + wantdir = normalize(end_pos - start_pos); if(!self.beam_initialized) {