From: Samual Lenks Date: Tue, 13 Aug 2013 21:58:05 +0000 (-0400) Subject: Actually, rework that last commit a bit X-Git-Tag: xonotic-v0.8.0~367 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4b392add16b790f2d7f58db3bd0e5bb51cb1db91;p=xonotic%2Fxonotic-data.pk3dir.git Actually, rework that last commit a bit --- diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 5d5f28789..44f8236f2 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -486,13 +486,12 @@ void CSQC_UpdateView(float w, float h) vector current_view_origin = (csqcplayer ? csqcplayer.origin : pmove_org); // detect maximum viewoffset and use it - WarpZone_TraceLine(current_view_origin, current_view_origin + autocvar_cl_eventchase_viewoffset + ('0 0 1' * autocvar_cl_eventchase_maxs_z), MOVE_WORLDONLY, self); - current_view_origin_z += - max(0, - (trace_fraction * autocvar_cl_eventchase_viewoffset_z) - - - autocvar_cl_eventchase_maxs_z - ); + if(autocvar_cl_eventchase_viewoffset) + { + WarpZone_TraceLine(current_view_origin, current_view_origin + autocvar_cl_eventchase_viewoffset + ('0 0 1' * autocvar_cl_eventchase_maxs_z), MOVE_WORLDONLY, self); + if(trace_fraction == 1) { current_view_origin += autocvar_cl_eventchase_viewoffset; } + else { current_view_origin_z += max(0, (trace_endpos_z - current_view_origin_z) - autocvar_cl_eventchase_maxs_z); } + } // We must enable chase_active to get a third person view (weapon viewmodel hidden and own player model showing). // Ideally, there should be another way to enable third person cameras, such as through setproperty()