From a7f171b732880d76e9fc109ae3240e2c06eb2889 Mon Sep 17 00:00:00 2001 From: Razish Date: Sat, 10 Feb 2024 23:31:11 +1100 Subject: [PATCH] cap the timescale sensitivity scale when timescale > 1.0 --- code/cgame/cg_view.cpp | 2 +- codeJK2/cgame/cg_view.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/cgame/cg_view.cpp b/code/cgame/cg_view.cpp index 01cb293e07..e82ada567e 100644 --- a/code/cgame/cg_view.cpp +++ b/code/cgame/cg_view.cpp @@ -2037,7 +2037,7 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView ) { //FIXME: should really send forcePowersActive over network onto cg.snap->ps... const int fpActive = cg_entities[0].gent->client->ps.forcePowersActive; const bool matrixMode = !!(fpActive & ((1 << FP_SPEED) | (1 << FP_RAGE))); - float speed = cg.refdef.fov_y / 75.0 * (matrixMode ? 1.0f : cg_timescale.value); + float speed = cg.refdef.fov_y / 75.0 * (matrixMode ? 1.0f : Q_min(cg_timescale.value, 1.0f)); //FIXME: junk code, BUG:168 diff --git a/codeJK2/cgame/cg_view.cpp b/codeJK2/cgame/cg_view.cpp index e3dcdd650d..b69a506a32 100644 --- a/codeJK2/cgame/cg_view.cpp +++ b/codeJK2/cgame/cg_view.cpp @@ -1862,7 +1862,7 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView ) { // let the client system know what our weapon and zoom settings are //FIXME: should really send forcePowersActive over network onto cg.snap->ps... - float speed = cg.refdef.fov_y / 75.0 * ((cg_entities[0].gent->client->ps.forcePowersActive&(1<client->ps.forcePowersActive&(1<