From 53caa21b55e86fa8185eabcf79693ba46689cccd Mon Sep 17 00:00:00 2001 From: Eidolon Date: Tue, 30 Apr 2024 23:13:58 -0500 Subject: [PATCH] Turn off water ripples when reducevfx is on A number of people have said they have sensory issues caused by the ripple effects from water and heat. This turns off those effects when reducevfx is on. It may be a better idea for this to be a separate option, but it's a starting point we can build upon later. --- src/r_plane.cpp | 4 ++++ src/v_video.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/r_plane.cpp b/src/r_plane.cpp index decda706a..efaa041e8 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -106,6 +106,10 @@ void R_InitPlanes(void) // ripples da water texture static fixed_t R_CalculateRippleOffset(drawspandata_t* ds, INT32 y) { + if (cv_reducevfx.value) + { + return 0; + } fixed_t distance = FixedMul(ds->planeheight, yslope[y]); const INT32 yay = (ds->planeripple.offset + (distance>>9)) & 8191; return FixedDiv(FINESINE(yay), (1<<12) + (distance>>11)); diff --git a/src/v_video.cpp b/src/v_video.cpp index dfab8889e..5a9e3c11e 100644 --- a/src/v_video.cpp +++ b/src/v_video.cpp @@ -3460,8 +3460,8 @@ void VID_DisplaySoftwareScreen() uv_offset, uv_size, { - postimgtype[i] == postimg_water, - postimgtype[i] == postimg_heat, + postimgtype[i] == postimg_water && !cv_reducevfx.value, + postimgtype[i] == postimg_heat && !cv_reducevfx.value, postimgtype[i] == postimg_flip, postimgtype[i] == postimg_mirror }