Smooth the fading effect

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 63ad0e8b1d9fc9a88fa36da9ec7f1bcec6e2656c..9312ac432a84ba57ed7e2716c1d8bd66b0f51a37 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -319,7 +319,7 @@ set cl_hitsound_antispam_time 0.05 "don't play the hitsound more often than this
 seta cl_chase_death 1 "camera goes into 3rd person mode when dead"
 seta cl_chase_intermission 1 "camera goes into 3rd person mode at match end"
 seta cl_chase_distance 100
-seta cl_chase_speed 50
+seta cl_chase_speed 1.5
 
 //nifreks lockonrestart feature, used in team-based game modes, if set to 1 and all players readied up no other player can then join the game anymore, useful to block spectators from joining
 set teamplay_lockonrestart 0 "it set to 1 in a team-based game, the teams are locked once all players readied up and the game restarted (no new players can join after restart unless using the server-command unlockteams)"

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 977119f70e503a4c2951b4badd00899dbb250606..0f67d60b70d90d9af121cfe252f45c0205a3d327 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -809,7 +809,7 @@ void CSQC_UpdateView(float w, float h)
                if(cvar("chase_active"))
                {
                        if(autocvar_cl_chase_speed && cvar("chase_back") < autocvar_cl_chase_distance)
-                               cvar_set("chase_back", ftos(cvar("chase_back") + (autocvar_cl_chase_speed * frametime)));
+                               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));
                }