thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move screenshake adjustments to "screenshake" cvar

Browse source
This commit is contained in:
AJ Martinez 2023-12-30 16:22:04 -07:00
parent 9ce15d3e15
commit cd638fd5e2
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cvars.cpp
View file

@ -549,6 +549,7 @@ consvar_t cv_playbackspeed = Server("playbackspeed", "1").min_max(1, 10).dont_sa
#endif #endif
consvar_t cv_reducevfx = Server("reducevfx", "No").yes_no(); consvar_t cv_reducevfx = Server("reducevfx", "No").yes_no();
consvar_t cv_screenshake = Server("screenshake", "Full").values({{0, "Off"}, {1, "Half"}, {2, "Full"}});
consvar_t cv_rendezvousserver = Server("holepunchserver", "relay.kartkrew.org"); consvar_t cv_rendezvousserver = Server("holepunchserver", "relay.kartkrew.org");

2
src/d_netcmd.h
View file

@ -92,7 +92,7 @@ extern consvar_t cv_botscanvote;
extern consvar_t cv_kartdebugitem, cv_kartdebugamount, cv_kartdebugdistribution, cv_kartdebughuddrop; extern consvar_t cv_kartdebugitem, cv_kartdebugamount, cv_kartdebugdistribution, cv_kartdebughuddrop;
extern consvar_t cv_kartdebugnodes, cv_kartdebugcolorize, cv_kartdebugdirector; extern consvar_t cv_kartdebugnodes, cv_kartdebugcolorize, cv_kartdebugdirector;
extern consvar_t cv_spbtest, cv_reducevfx; extern consvar_t cv_spbtest, cv_reducevfx, cv_screenshake;
extern consvar_t cv_kartdebugwaypoints, cv_kartdebugbots; extern consvar_t cv_kartdebugwaypoints, cv_kartdebugbots;
extern consvar_t cv_kartdebugstart; extern consvar_t cv_kartdebugstart;
extern consvar_t cv_debugrank; extern consvar_t cv_debugrank;

3
src/menus/options-profiles-edit-accessibility.cpp
View file

@ -115,6 +115,9 @@ menuitem_t OPTIONS_ProfileAccessibility[] = {
{IT_STRING | IT_CVAR, "Reduce Effects", "If overwhelmed, hide less-important particle cues.", {IT_STRING | IT_CVAR, "Reduce Effects", "If overwhelmed, hide less-important particle cues.",
NULL, {.cvar = &cv_reducevfx}, 0, 0}, NULL, {.cvar = &cv_reducevfx}, 0, 0},
{IT_STRING | IT_CVAR, "Screenshake Strength", "Adjust shake intensity from damage, hazards, and offroad.",
NULL, {.cvar = &cv_screenshake}, 0, 0},
}; };
menu_t OPTIONS_ProfileAccessibilityDef = { menu_t OPTIONS_ProfileAccessibilityDef = {

7
src/p_spec.c
View file

@ -9454,7 +9454,7 @@ void P_DoQuakeOffset(UINT8 view, mappoint_t *viewPos, mappoint_t *offset)
fixed_t ir = 0; fixed_t ir = 0;
fixed_t addZ = 0; fixed_t addZ = 0;
if (cv_reducevfx.value == 1) if (cv_screenshake.value == 0)
{ {
return; return;
} }
@ -9517,6 +9517,11 @@ void P_DoQuakeOffset(UINT8 view, mappoint_t *viewPos, mappoint_t *offset)
addZ = -addZ; addZ = -addZ;
} }
if (cv_screenshake.value == 1) // Half
{
addZ /= 2;
}
// Finalize the effects. // Finalize the effects.
offset->z += addZ; offset->z += addZ;
} }