From: Mircea Kitsune Date: Sat, 26 Mar 2011 16:18:47 +0000 (+0200) Subject: Cvar the two chase cam types X-Git-Tag: xonotic-v0.5.0~268^2^2~44 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2499b71f0d92c2add8c5e9a9b13e7252dc085d58;p=xonotic%2Fxonotic-data.pk3dir.git Cvar the two chase cam types --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index a500cec9e..472d9e90f 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -316,6 +316,9 @@ set sv_ready_restart_repeatable 0 "allows the players to restart the game as oft seta cl_hitsound 1 "play a hit notifier sound when you have hit an enemy" 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" + //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 c2097524e..3b44a4239 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -794,9 +794,9 @@ 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); } - if(spectatee_status >= 0) + if(spectatee_status >= 0 && (autocvar_cl_chase_death || autocvar_cl_chase_intermission)) { - if((getstati(STAT_HEALTH) <= 0 && !intermission) || (intermission)) + if((autocvar_cl_chase_death && getstati(STAT_HEALTH) <= 0 && !intermission) || (autocvar_cl_chase_intermission && intermission)) { if(!cvar("chase_active")) cvar_set("chase_active", "1"); diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index d380c7fc3..8989762ec 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -305,3 +305,5 @@ float autocvar_viewsize; float autocvar_crosshair_color_by_health; float autocvar_cl_hitsound; float autocvar_cl_hitsound_antispam_time; +float autocvar_cl_chase_death; +float autocvar_cl_chase_intermission;