Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SP] cap the timescale sensitivity scale when timescale > 1.0 #1204

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[SP] cap the timescale sensitivity scale when timescale > 1.0 #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/cgame/cg_view.cpp
View file
Open in desktop
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion codeJK2/cgame/cg_view.cpp
View file
Open in desktop
Expand Up @@ -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<<FP_SPEED))?1.0f:cg_timescale.value);
float speed = cg.refdef.fov_y / 75.0 * ((cg_entities[0].gent->client->ps.forcePowersActive&(1<<FP_SPEED))?1.0f:Q_min(cg_timescale.value, 1.0f));

//FIXME: junk code, BUG:168

Expand Down