From: Mircea Kitsune Date: Thu, 31 Mar 2011 22:49:13 +0000 (+0300) Subject: No need to stop updating the view origin while in the map voting screen. As long... X-Git-Tag: xonotic-v0.5.0~268^2^2~14 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf2e72e4ef69ebd99af6aef97a895451b65887f8;p=xonotic%2Fxonotic-data.pk3dir.git No need to stop updating the view origin while in the map voting screen. As long as the view *angles* are blocked there, the camera won't move while using the mouse in map voting. --- diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index ecd64b82e..49127578d 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -432,17 +432,14 @@ void CSQC_UpdateView(float w, float h) else if(chase_current_distance != autocvar_cl_chase_distance) chase_current_distance = autocvar_cl_chase_distance; - if not(intermission > 1) // don't update view origin during the map voting screen - { - makevectors(view_angles); - // pass 1, used to check where the camera would go and obtain the trace_fraction - chase_target_origin = pmove_org - view_forward * chase_current_distance; - - traceline(pmove_org, chase_target_origin, MOVE_NORMAL, self); - // pass 2, also multiplying view_forward with trace_fraction, to prevent the camera from going through walls - // The 0.1 subtraction is to not limit the camera precisely at the wall surface, as that allows the view to poke through - chase_target_origin = pmove_org - view_forward * chase_current_distance * (trace_fraction - 0.1); - } + makevectors(view_angles); + // pass 1, used to check where the camera would go and obtain the trace_fraction + chase_target_origin = pmove_org - view_forward * chase_current_distance; + + traceline(pmove_org, chase_target_origin, MOVE_NORMAL, self); + // pass 2, also multiplying view_forward with trace_fraction, to prevent the camera from going through walls + // The 0.1 subtraction is to not limit the camera precisely at the wall surface, as that allows the view to poke through + chase_target_origin = pmove_org - view_forward * chase_current_distance * (trace_fraction - 0.1); R_SetView(VF_ORIGIN, chase_target_origin); }