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

Merge commit 'refs/pull/1227/head' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2020-10-27 10:42:42 -04:00
commit 6770def806
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wadsrc/static/menudef.txt
View file

@ -385,8 +385,10 @@ OptionMenu "OptionsMenu" protected
Option "$OPTMNU_SIMPLEON", "m_simpleoptions", "OnOff"
StaticText " "
SafeCommand "$OPTMNU_DEFAULTS", "reset2defaults"
SafeCommand "$OPTMNU_DEFAULTS", "reset2defaults"
SafeCommand "$OPTMNU_RESETTOSAVED", "reset2saved"
SafeCommand "$OPTMNU_WRITEINI", "writeini"
Command "$OPTMNU_CONSOLE", "menuconsole"
StaticText " "
}
@ -1623,7 +1625,7 @@ OptionMenu GameplayOptions protected
Submenu "$GMPLYMNU_COOPERATIVE", "CoopOptions"
StaticText " "
Option "$GMPLYMNU_TEAMPLAY", "teamplay", "OnOff"
Slider "$GMPLYMNU_TEAMDAMAGE", "teamdamage", 0, 1, 0.05,2
Slider "$GMPLYMNU_TEAMDAMAGE", "teamdamage", 0, 1, 0.05,2
StaticText " "
Option "$GMPLYMNU_SMARTAUTOAIM", "sv_smartaim", "SmartAim"
StaticText " "
@ -1654,6 +1656,7 @@ OptionMenu GameplayOptions protected
Option "$GMPLYMNU_DONTCHECKAMMO", "sv_dontcheckammo", "NoYes"
Option "$GMPLYMNU_KILLBOSSSPAWNS", "sv_killbossmonst", "YesNo"
Option "$GMPLYMNU_NOCOUNTENDMONSTER", "sv_nocountendmonst", "NoYes"
Option "$GMPLYMNU_ALWAYSSPAWNMULTI", "sv_alwaysspawnmulti", "YesNo"
Class "GameplayMenu"
}

5
wadsrc/static/menudef.zsimple
View file

@ -1,6 +1,6 @@
// this file has the simplified menu here.
// this file is *only* for options that are relevant to a novice user of GZDoom
// this file needs to be regularly pruned, with options coalesced as much as possible. any and all verbosity should go to the classic menus.
// this file needs to be regularly pruned, with options coalesced as much as possible. any and all verbosity should go to the "full" menus.
OptionMenu "OptionsMenuSimple" protected
{
@ -19,8 +19,9 @@ OptionMenu "OptionsMenuSimple" protected
StaticText " "
Submenu "$OPTMNU_FULLOPTIONS", "OptionsMenuFull"
StaticText " "
SafeCommand "$OPTMNU_DEFAULTS", "reset2defaults"
SafeCommand "$OPTMNU_DEFAULTS", "reset2defaults"
SafeCommand "$OPTMNU_RESETTOSAVED", "reset2saved"
SafeCommand "$OPTMNU_WRITEINI", "writeini"
Command "$OPTMNU_CONSOLE", "menuconsole"
StaticText " "
}