From 1411b7548864cf99ee64aa88751e03bbb94e3cf6 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sat, 14 May 2011 17:27:59 +0300 Subject: [PATCH] Event chasecam fixes done in Xonotic --- data/qcsrc/client/View.qc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 6ae6d038..84e80140 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -322,6 +322,7 @@ void CSQC_UpdateView(float w, float h) eventchase_target_origin = pmove_org - v_forward * eventchase_current_distance * (trace_fraction - 0.1); R_SetView(VF_ORIGIN, eventchase_target_origin); + R_SetView(VF_ANGLES, view_angles); } else if(cvar("chase_active") < 0) // time to disable chase_active if it was set by this code { @@ -747,7 +748,7 @@ void CSQC_UpdateView(float w, float h) cvar_set("r_glsl_postprocess_uservec2_enable", ftos(cvar("hud_powerup") != 0)); // lets apply the postprocess effects from the previous two functions if needed - if(damage_blurpostprocess_x || content_blurpostprocess_x) + if((damage_blurpostprocess_x || content_blurpostprocess_x) && cvar("chase_active") >= 0) // not while the event camera is active { float blurradius = bound(0, damage_blurpostprocess_y + content_blurpostprocess_y, cvar("hud_postprocessing_maxblurradius")); float bluralpha = bound(0, damage_blurpostprocess_z + content_blurpostprocess_z, cvar("hud_postprocessing_maxbluralpha")); @@ -771,7 +772,7 @@ void CSQC_UpdateView(float w, float h) if (getstatf(STAT_INVINCIBLE_FINISHED) - time > 0) sharpen_intensity += (getstatf(STAT_INVINCIBLE_FINISHED) - time); - if(cvar("hud_powerup") && sharpen_intensity > 0) + if(cvar("hud_powerup") && sharpen_intensity > 0 && cvar("chase_active") >= 0) // not while the event camera is active { sharpen_intensity = bound(0, sharpen_intensity, 5); // powerup warning time is 5 seconds, so fade the effect from there -- 2.39.2