From 74e1cafd9dc12f3bbc7c5f65400c2f35094f4e02 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 28 Jan 2024 18:57:19 +0100 Subject: [PATCH] this too --- src/hardware/hw_main.c | 18 +----------------- src/hardware/hw_main.h | 1 - 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 63a1c862c..76e5abe67 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -162,7 +162,6 @@ consvar_t cv_grfakecontrast = {"gr_fakecontrast", "Standard", CV_SAVE, grfakecon consvar_t cv_grslopecontrast = {"gr_slopecontrast", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_grhorizonlines = {"gr_horizonlines", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_rippletest = {"rippletest", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; #define ONLY_IF_GL_LOADED if (vid.glstate != VID_GL_LIBRARY_LOADED) return; @@ -3505,24 +3504,10 @@ void HWR_Subsector(size_t num) { if (sub->validcount != validcount) { - if (gr_frontsector->ffloors && cv_rippletest.value) - { - for (rover = gr_frontsector->ffloors; rover; rover = rover->next) - { - if ((rover->flags & FF_RIPPLE) && !(*postprocessor == postimg_water) && - (*rover->topheight > (locFloorHeight == cullFloorHeight ? locFloorHeight : gr_frontsector->floorheight)) && ((*rover->bottomheight <= (locFloorHeight == cullFloorHeight ? locFloorHeight : gr_frontsector->floorheight))) && - ((viewz < *rover->topheight && !(rover->flags & FF_INVERTPLANES)) || - (viewz > *rover->topheight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) // this check is ass - { - floorflags |= PF_Ripple; - } - } - } - HWR_GetFlat(levelflats[gr_frontsector->floorpic].lumpnum, R_NoEncore(gr_frontsector, false)); HWR_RenderPlane(sub, &extrasubsectors[num], false, locFloorHeight == cullFloorHeight ? locFloorHeight : gr_frontsector->floorheight, - floorflags, floorlightlevel, levelflats[gr_frontsector->floorpic].lumpnum, NULL, 255, floorcolormap); + PF_Ripple, floorlightlevel, levelflats[gr_frontsector->floorpic].lumpnum, NULL, 255, floorcolormap); } } } @@ -6460,7 +6445,6 @@ void HWR_AddCommands(void) CV_RegisterVar(&cv_grpaletterendering); CV_RegisterVar(&cv_grpalettedepth); CV_RegisterVar(&cv_grflashpal); - CV_RegisterVar(&cv_rippletest); } // -------------------------------------------------------------------------- diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index dac1f03c1..2c05e4e8e 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -199,7 +199,6 @@ extern consvar_t cv_grscreentextures; extern consvar_t cv_grportals; extern consvar_t cv_nostencil; extern consvar_t cv_secbright; -extern consvar_t cv_rippletest; extern CV_PossibleValue_t granisotropicmode_cons_t[];