From 1c84546ea45421737ac5d2c018e00fe5f6b73c86 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 14 Dec 2014 18:50:48 +0100 Subject: [PATCH] Put eventchase conditions in a function for clearness sake --- qcsrc/client/View.qc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index e4deda034..ffdd89c97 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -394,6 +394,21 @@ float contentavgalpha, liquidalpha_prev; vector liquidcolor_prev; float eventchase_current_distance; +float WantEventchase() +{ + if(autocvar_cl_orthoview) + return FALSE; + if(intermission) + return TRUE; + if(spectatee_status >= 0) + { + if(autocvar_cl_eventchase_death && (getstati(STAT_HEALTH) <= 0)) + return TRUE; + if(autocvar_cl_eventchase_nexball && gametype == MAPINFO_TYPE_NEXBALL && !(WepSet_GetFromStat() & WepSet_FromWeapon(WEP_PORTO))) + return TRUE; + } + return FALSE; +} vector damage_blurpostprocess, content_blurpostprocess; @@ -495,8 +510,7 @@ void CSQC_UpdateView(float w, float h) // event chase camera if(autocvar_chase_active <= 0) // greater than 0 means it's enabled manually, and this code is skipped { - WepSet weapons_stat = WepSet_GetFromStat(); - if(((spectatee_status >= 0 && (autocvar_cl_eventchase_death && is_dead)) || intermission) && !autocvar_cl_orthoview || (autocvar_cl_eventchase_nexball && spectatee_status >= 0 && gametype == MAPINFO_TYPE_NEXBALL && !(weapons_stat & WepSet_FromWeapon(WEP_PORTO)))) + if(WantEventchase()) { // make special vector since we can't use view_origin (It is one frame old as of this code, it gets set later with the results this code makes.) vector current_view_origin = (csqcplayer ? csqcplayer.origin : pmove_org); -- 2.39.2