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

- remove 320x240 from the list of resolution presets

Browse source 
- enforce a minimum CleanXfac scaling in the menu to prevent accidental divide by 0's
This commit is contained in:
Rachael Alexanderson 2019-04-07 06:01:47 -04:00 committed by Christoph Oelckers
parent ec0c82d986
commit b4407eb241
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/v_video.cpp
View file

@ -550,7 +550,7 @@ void V_UpdateModeSize (int width, int height)
// This reference size is being used so that on 800x450 (small 16:9) a scale of 2 gets used. // This reference size is being used so that on 800x450 (small 16:9) a scale of 2 gets used.
CleanXfac = std::min(screen->GetWidth() / 400, screen->GetHeight() / 240); CleanXfac = std::max(std::min(screen->GetWidth() / 400, screen->GetHeight() / 240), 1);
if (CleanXfac >= 4) CleanXfac--; // Otherwise we do not have enough space for the episode/skill menus in some languages. if (CleanXfac >= 4) CleanXfac--; // Otherwise we do not have enough space for the episode/skill menus in some languages.
CleanYfac = CleanXfac; CleanYfac = CleanXfac;
CleanWidth = screen->GetWidth() / CleanXfac; CleanWidth = screen->GetWidth() / CleanXfac;

1
wadsrc/static/menudef.txt
View file

@ -2189,7 +2189,6 @@ OptionMenu CustomResolutionMenu protected
StaticText "$VIDMNU_RESPRESETHEAD" StaticText "$VIDMNU_RESPRESETHEAD"
StaticText "" StaticText ""
StaticText "$VIDMNU_ASPECT43" StaticText "$VIDMNU_ASPECT43"
Command "320x240", "menu_resolution_set_custom 320 240"
Command "640x480", "menu_resolution_set_custom 640 480" Command "640x480", "menu_resolution_set_custom 640 480"
Command "1024x768", "menu_resolution_set_custom 1024 768" Command "1024x768", "menu_resolution_set_custom 1024 768"
Command "1280x960", "menu_resolution_set_custom 1280 960" Command "1280x960", "menu_resolution_set_custom 1280 960"