Change how the camera position is set. No more setting the chase_back cvar, but use...

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 909aceae86f5b0aae665cfe7f98fa18fa8d907f5..62578e539e701b27ee6c07a81bca053280a3102a 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -367,7 +367,8 @@ float contentavgalpha, liquidalpha_prev;
 vector liquidcolor_prev;
 
 float chase_used;
-float chase_default, chase_back_default;
+float chase_default;
+float chase_current_distance;
 
 void CSQC_UpdateView(float w, float h)
 {
@@ -404,6 +405,42 @@ void CSQC_UpdateView(float w, float h)
        input_angles = warpzone_fixview_cl_viewangles;
        view_angles = warpzone_fixview_angles;
 
+       // event chase cam
+       if(spectatee_status >= 0 && (autocvar_cl_chase_death || autocvar_cl_chase_intermission))
+       {
+               if((autocvar_cl_chase_death && getstati(STAT_HEALTH) <= 0 && !intermission) || (autocvar_cl_chase_intermission && intermission))
+               {
+                       if(!chase_used)
+                       {
+                               cvar_set("chase_active", "1");
+                               chase_used = TRUE;
+                       }
+
+                       // make the camera smooth back
+                       if(autocvar_cl_chase_speed && chase_current_distance < autocvar_cl_chase_distance)
+                               chase_current_distance += autocvar_cl_chase_speed * (autocvar_cl_chase_distance - chase_current_distance) * frametime;
+                       else if(chase_current_distance != autocvar_cl_chase_distance)
+                               chase_current_distance = autocvar_cl_chase_distance;
+
+                       makevectors(view_angles);
+                       R_SetView(VF_ORIGIN_X, pmove_org_x - view_forward_x * chase_current_distance);
+                       R_SetView(VF_ORIGIN_Y, pmove_org_y - view_forward_y * chase_current_distance);
+               }
+               else
+               {
+                       if(chase_used)
+                       {
+                               cvar_set("chase_active", ftos(chase_default));
+                               chase_current_distance = 0; // start from 0
+                               chase_used = FALSE;
+                       }
+
+                       // keep the defaults updated
+                       if(chase_default != cvar("chase_active"))
+                               chase_default = cvar("chase_active");
+               }
+       }
+
        if(autocvar_cl_lockview || (autocvar__hud_configure && spectatee_status <= 0))
        {
                pmove_org = freeze_pmove_org;
@@ -797,41 +834,6 @@ void CSQC_UpdateView(float w, float h)
                        drawpic(splash_pos, "gfx/blood", splash_size, stov(autocvar_hud_damage_color), bound(0, myhealth_flash_temp, 1) * autocvar_hud_damage, DRAWFLAG_NORMAL);
        }
 
-       // event chase cam
-       if(spectatee_status >= 0 && (autocvar_cl_chase_death || autocvar_cl_chase_intermission))
-       {
-               if((autocvar_cl_chase_death && getstati(STAT_HEALTH) <= 0 && !intermission) || (autocvar_cl_chase_intermission && intermission))
-               {
-                       if(!chase_used)
-                       {
-                               cvar_set("chase_active", "1");
-                               cvar_set("chase_back", "0"); // start from 0
-                               chase_used = TRUE;
-                       }
-
-                       // make the camera smooth back
-                       if(autocvar_cl_chase_speed && cvar("chase_back") < autocvar_cl_chase_distance)
-                               cvar_set("chase_back", ftos(cvar("chase_back") + (autocvar_cl_chase_speed * (autocvar_cl_chase_distance - cvar("chase_back")) * frametime)));
-                       else if(cvar("chase_back") != autocvar_cl_chase_distance)
-                               cvar_set("chase_back", ftos(autocvar_cl_chase_distance));
-               }
-               else
-               {
-                       if(chase_used)
-                       {
-                               cvar_set("chase_active", ftos(chase_default));
-                               cvar_set("chase_back", ftos(chase_back_default));
-                               chase_used = FALSE;
-                       }
-
-                       // keep the defaults updated
-                       if(chase_default != cvar("chase_active"))
-                               chase_default = cvar("chase_active");
-                       if(chase_back_default != cvar("chase_back"))
-                               chase_back_default = cvar("chase_back");
-               }
-       }
-
        // Draw the mouse cursor
        // NOTE: drawpic must happen after R_RenderScene for some reason
        //drawpic(getmousepos(), "gfx/cursor.tga", '11 14 0', '1 1 1', 1, 0);