zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 07:57:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed r_columnmethod 1 because the code was broken and already gone from QZDoom.

Browse source
This commit is contained in:
Christoph Oelckers 2017-01-10 22:28:15 +01:00
parent 6552e5a7a1
commit 11d93cb030
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/r_draw.cpp
View file

@ -435,7 +435,7 @@ namespace swrenderer
{ {
dc_colormap += fixedlightlev; dc_colormap += fixedlightlev;
} }
return r_columnmethod ? DoDraw1 : DoDraw0; return DoDraw0;
} }
fglevel = GetAlpha(style.SrcAlpha, alpha); fglevel = GetAlpha(style.SrcAlpha, alpha);
@ -468,7 +468,7 @@ namespace swrenderer
{ {
return DontDraw; return DontDraw;
} }
return r_columnmethod ? DoDraw1 : DoDraw0; return DoDraw0;
} }
ESPSResult R_SetPatchStyle(FRenderStyle style, float alpha, int translation, uint32_t color) ESPSResult R_SetPatchStyle(FRenderStyle style, float alpha, int translation, uint32_t color)

1
wadsrc/static/language.enu
View file

@ -1779,7 +1779,6 @@ DSPLYMNU_SCREENSIZE = "Screen size";
DSPLYMNU_BRIGHTNESS = "Brightness"; DSPLYMNU_BRIGHTNESS = "Brightness";
DSPLYMNU_VSYNC = "Vertical Sync"; DSPLYMNU_VSYNC = "Vertical Sync";
DSPLYMNU_CAPFPS = "Rendering Interpolation"; DSPLYMNU_CAPFPS = "Rendering Interpolation";
DSPLYMNU_COLUMNMETHOD = "Column render mode";
DSPLYMNU_WIPETYPE = "Screen wipe style"; DSPLYMNU_WIPETYPE = "Screen wipe style";
DSPLYMNU_SHOWENDOOM = "Show ENDOOM screen"; DSPLYMNU_SHOWENDOOM = "Show ENDOOM screen";
DSPLYMNU_BLOODFADE = "Blood Flash Intensity"; DSPLYMNU_BLOODFADE = "Blood Flash Intensity";

7
wadsrc/static/menudef.txt
View file

@ -594,12 +594,6 @@ OptionMenu "JoystickConfigMenu"
// //
//------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------
OptionValue ColumnMethods
{
0.0, "$OPTVAL_ORIGINAL"
1.0, "$OPTVAL_OPTIMIZED"
}
OptionValue SkyModes OptionValue SkyModes
{ {
0.0, "$OPTVAL_NORMAL" 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_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_PICKUPFADE", "pickup_fade_scalar", 0.0, 1.0, 0.05, 2
Slider "$DSPLYMNU_WATERFADE", "underwater_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 " " StaticText " "
Option "$DSPLYMNU_WIPETYPE", "wipetype", "Wipes" Option "$DSPLYMNU_WIPETYPE", "wipetype", "Wipes"