zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- disallow changing the line spacing for option menus.

Browse source 
With the VGA font this makes no sense anymore.
This commit is contained in:
Christoph Oelckers 2021-10-03 15:54:08 +02:00
parent 6bf487dac3
commit 6e9e75c02c
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/menu/menudef.cpp
View file

@ -910,7 +910,7 @@ static void ParseOptionSettings(FScanner &sc)
else if (sc.Compare("Linespacing")) else if (sc.Compare("Linespacing"))
{ {
sc.MustGetNumber(); sc.MustGetNumber();
OptionSettings.mLinespacing = sc.Number; // ignored
} }
else if (sc.Compare("LabelOffset")) else if (sc.Compare("LabelOffset"))
{ {
@ -1402,6 +1402,7 @@ void M_ParseMenuDefs()
DefaultOptionMenuSettings = Create<DOptionMenuDescriptor>(); DefaultOptionMenuSettings = Create<DOptionMenuDescriptor>();
DefaultListMenuSettings->Reset(); DefaultListMenuSettings->Reset();
DefaultOptionMenuSettings->Reset(); DefaultOptionMenuSettings->Reset();
OptionSettings.mLinespacing = 17;
int IWADMenu = fileSystem.CheckNumForName("MENUDEF", ns_global, fileSystem.GetIwadNum()); int IWADMenu = fileSystem.CheckNumForName("MENUDEF", ns_global, fileSystem.GetIwadNum());

12
wadsrc/static/menudef.txt
View file

@ -344,18 +344,6 @@ OptionValue AutoOffOn
1, "$OPTVAL_ON" 1, "$OPTVAL_ON"
} }
OptionMenuSettings
{
// These can be overridden if a different menu fonts requires it.
Linespacing 17
/*
IfGame(Heretic, Hexen)
{
Linespacing 9
}
*/
}
DefaultOptionMenu DefaultOptionMenu
{ {
Position -15 Position -15