From: terencehill <piuntn@gmail.com>
Date: Sun, 30 Sep 2018 14:11:34 +0000 (+0200)
Subject: Make cl_eventchase_spectated_change last 1 second instead of 0.5s; allow customizing... 
X-Git-Tag: xonotic-v0.8.5~1792^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=20763708b3a02ee500d30f32835047da1fd85ca8;p=xonotic%2Fxonotic-data.pk3dir.git

Make cl_eventchase_spectated_change last 1 second instead of 0.5s; allow customizing this value with the new cvar cl_eventchase_spectated_change_time
---

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 065441870..db756608d 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -412,6 +412,7 @@ float autocvar_cl_hitsound_max_pitch = 1.5;
 float autocvar_cl_hitsound_nom_damage = 25;
 float autocvar_cl_hitsound_antispam_time;
 int autocvar_cl_eventchase_spectated_change = 1;
+float autocvar_cl_eventchase_spectated_change_time = 1;
 int autocvar_cl_eventchase_death = 1;
 float autocvar_cl_eventchase_distance = 140;
 bool autocvar_cl_eventchase_frozen = false;
diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 126815cc1..b72998de6 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -831,7 +831,7 @@ int WantEventchase(entity this)
 		}
 		if (spectatee_status > 0 && autocvar_cl_eventchase_spectated_change)
 		{
-			if (time <= spectatee_status_changed_time + 0.5)
+			if (time <= spectatee_status_changed_time + min(3, autocvar_cl_eventchase_spectated_change_time))
 				return 1;
 			else if (eventchase_running)
 				return -1; // disable chase_active while eventchase is still enabled so to avoid a glicth
diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 51c66081f..68ea9da69 100644
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -198,6 +198,7 @@ seta cl_hitsound_max_pitch 1.5 "maximum pitch of hit sound"
 seta cl_hitsound_nom_damage 25 "damage amount at which hitsound bases pitch off"
 
 seta cl_eventchase_spectated_change 1 "camera goes into 3rd person mode for a moment when changing spectated player"
+seta cl_eventchase_spectated_change_time 1 "how much time the effect lasts when changing spectated player"
 seta cl_eventchase_death 1 "camera goes into 3rd person mode when the player is dead; set to 2 to active the effect only when the corpse doesn't move anymore"
 seta cl_eventchase_frozen 0 "camera goes into 3rd person mode when the player is frozen"
 seta cl_eventchase_nexball 1 "camera goes into 3rd person mode when in nexball game-mode"