diff --git a/src/r_draw.cpp b/src/r_draw.cpp index 8206c2391..10bc104c2 100644 --- a/src/r_draw.cpp +++ b/src/r_draw.cpp @@ -435,7 +435,7 @@ namespace swrenderer { dc_colormap += fixedlightlev; } - return r_columnmethod ? DoDraw1 : DoDraw0; + return DoDraw0; } fglevel = GetAlpha(style.SrcAlpha, alpha); @@ -468,7 +468,7 @@ namespace swrenderer { return DontDraw; } - return r_columnmethod ? DoDraw1 : DoDraw0; + return DoDraw0; } ESPSResult R_SetPatchStyle(FRenderStyle style, float alpha, int translation, uint32_t color) diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index fc611b3c0..b7558d1b2 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -1779,7 +1779,6 @@ DSPLYMNU_SCREENSIZE = "Screen size"; DSPLYMNU_BRIGHTNESS = "Brightness"; DSPLYMNU_VSYNC = "Vertical Sync"; DSPLYMNU_CAPFPS = "Rendering Interpolation"; -DSPLYMNU_COLUMNMETHOD = "Column render mode"; DSPLYMNU_WIPETYPE = "Screen wipe style"; DSPLYMNU_SHOWENDOOM = "Show ENDOOM screen"; DSPLYMNU_BLOODFADE = "Blood Flash Intensity"; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 06ad094d6..47213a0f6 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -594,12 +594,6 @@ OptionMenu "JoystickConfigMenu" // //------------------------------------------------------------------------------------------- -OptionValue ColumnMethods -{ - 0.0, "$OPTVAL_ORIGINAL" - 1.0, "$OPTVAL_OPTIMIZED" -} - OptionValue SkyModes { 0.0, "$OPTVAL_NORMAL" @@ -684,7 +678,6 @@ OptionMenu "VideoOptions" Slider "$DSPLYMNU_BLOODFADE", "blood_fade_scalar", 0.0, 1.0, 0.05, 2 Slider "$DSPLYMNU_PICKUPFADE", "pickup_fade_scalar", 0.0, 1.0, 0.05, 2 Slider "$DSPLYMNU_WATERFADE", "underwater_fade_scalar", 0.0, 1.0, 0.05, 2 - Option "$DSPLYMNU_COLUMNMETHOD", "r_columnmethod", "ColumnMethods" StaticText " " Option "$DSPLYMNU_WIPETYPE", "wipetype", "Wipes"