From 679aff2ec2063556dff2197e2cae26de2b6bb9d1 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 24 Jun 2016 18:32:29 +1000 Subject: [PATCH] Add an option to satisfy the voters --- defaultXonotic.cfg | 1 + qcsrc/lib/csqcmodel/cl_player.qc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index dea35012a..9a136cdae 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1193,6 +1193,7 @@ seta cl_forcemyplayermodel "" "set to the model file name you want to show yours seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)" seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)" seta cl_movement_errorcompensation 1 "try to compensate for prediction errors and reduce preceived lag" +seta cl_movement_intermissionrunning 0 "keep velocity after the match ends, players may appear to continue running while stationary" // campaign internal, set when loading a campaign map1G set _campaign_index "" diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc index fb68f368a..3b4c5fe69 100644 --- a/qcsrc/lib/csqcmodel/cl_player.qc +++ b/qcsrc/lib/csqcmodel/cl_player.qc @@ -35,6 +35,7 @@ #include float autocvar_cl_movement_errorcompensation = 0; +bool autocvar_cl_movement_intermissionrunning = false; // engine stuff float pmove_onground; // weird engine flag we shouldn't really use but have to for now @@ -254,7 +255,7 @@ void CSQCPlayer_SetViewLocation() /** Called once per CSQC_UpdateView() */ void CSQCPlayer_SetCamera() { - const vector v0 = ((intermission) ? '0 0 0' : pmove_vel); // TRICK: pmove_vel is set by the engine when we get here. No need to network velocity + const vector v0 = ((intermission && autocvar_cl_movement_intermissionrunning) ? '0 0 0' : pmove_vel); // TRICK: pmove_vel is set by the engine when we get here. No need to network velocity const float vh = STAT(VIEWHEIGHT); const vector pl_viewofs = STAT(PL_VIEW_OFS, NULL); const vector pl_viewofs_crouch = STAT(PL_CROUCH_VIEW_OFS, NULL); -- 2.39.2