zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 15:22:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved the flag display in the gameplay and compatibility menus down below the headline.

Browse source
This commit is contained in:
Christoph Oelckers 2019-03-17 17:08:44 +01:00
parent 59f0a377d4
commit a6051c8231
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wadsrc/static/menudef.txt
View file

@ -1491,6 +1491,7 @@ OptionValue JumpCrouchFreeLook
OptionMenu GameplayOptions protected OptionMenu GameplayOptions protected
{ {
Position -35
Title "$GMPLYMNU_TITLE" Title "$GMPLYMNU_TITLE"
//Indent 222 //Indent 222
Submenu "$GMPLYMNU_DEATHMATCH", "DeathmatchOptions" Submenu "$GMPLYMNU_DEATHMATCH", "DeathmatchOptions"
@ -1533,6 +1534,7 @@ OptionMenu GameplayOptions protected
OptionMenu DeathmatchOptions protected OptionMenu DeathmatchOptions protected
{ {
Position -35
Title "$GMPLYMNU_DEATHMATCH" Title "$GMPLYMNU_DEATHMATCH"
Option "$GMPLYMNU_WEAPONSSTAY", "sv_weaponstay", "YesNo" Option "$GMPLYMNU_WEAPONSSTAY", "sv_weaponstay", "YesNo"
@ -1553,6 +1555,7 @@ OptionMenu DeathmatchOptions protected
OptionMenu CoopOptions protected OptionMenu CoopOptions protected
{ {
Position -35
Title "$GMPLYMNU_COOPERATIVE" Title "$GMPLYMNU_COOPERATIVE"
Option "$GMPLYMNU_MULTIPLAYERWEAPONS", "sv_noweaponspawn", "NoYes" Option "$GMPLYMNU_MULTIPLAYERWEAPONS", "sv_noweaponspawn", "NoYes"
@ -1587,6 +1590,7 @@ OptionValue CompatModes
OptionMenu "CompatibilityOptions" protected OptionMenu "CompatibilityOptions" protected
{ {
Position -35
Title "$CMPTMNU_TITLE" Title "$CMPTMNU_TITLE"
Option "$CMPTMNU_MODE", "compatmode", "CompatModes", "", 1 Option "$CMPTMNU_MODE", "compatmode", "CompatModes", "", 1
StaticText " " StaticText " "
@ -1601,6 +1605,7 @@ OptionMenu "CompatibilityOptions" protected
OptionMenu "CompatActorMenu" protected OptionMenu "CompatActorMenu" protected
{ {
Position -35
Title "$CMPTMNU_ACTORBEHAVIOR" Title "$CMPTMNU_ACTORBEHAVIOR"
Option "$CMPTMNU_CORPSEGIBS", "compat_CORPSEGIBS", "YesNo" Option "$CMPTMNU_CORPSEGIBS", "compat_CORPSEGIBS", "YesNo"
Option "$CMPTMNU_NOBLOCKFRIENDS", "compat_NOBLOCKFRIENDS", "YesNo" Option "$CMPTMNU_NOBLOCKFRIENDS", "compat_NOBLOCKFRIENDS", "YesNo"
@ -1616,6 +1621,7 @@ OptionMenu "CompatActorMenu" protected
OptionMenu "CompatDehackedMenu" protected OptionMenu "CompatDehackedMenu" protected
{ {
Position -35
Title "$CMPTMNU_DEHACKEDBEHAVIOR" Title "$CMPTMNU_DEHACKEDBEHAVIOR"
Option "$CMPTMNU_DEHHEALTH", "compat_DEHHEALTH", "YesNo" Option "$CMPTMNU_DEHHEALTH", "compat_DEHHEALTH", "YesNo"
Option "$CMPTMNU_MUSHROOM", "compat_MUSHROOM", "YesNo" Option "$CMPTMNU_MUSHROOM", "compat_MUSHROOM", "YesNo"
@ -1624,6 +1630,7 @@ OptionMenu "CompatDehackedMenu" protected
OptionMenu "CompatMapMenu" protected OptionMenu "CompatMapMenu" protected
{ {
Position -35
Title "$CMPTMNU_MAPACTIONBEHAVIOR" Title "$CMPTMNU_MAPACTIONBEHAVIOR"
Option "$CMPTMNU_USEBLOCKING", "compat_USEBLOCKING", "YesNo" Option "$CMPTMNU_USEBLOCKING", "compat_USEBLOCKING", "YesNo"
Option "$CMPTMNU_ANYBOSSDEATH", "compat_ANYBOSSDEATH", "YesNo" Option "$CMPTMNU_ANYBOSSDEATH", "compat_ANYBOSSDEATH", "YesNo"
@ -1642,6 +1649,7 @@ OptionMenu "CompatMapMenu" protected
OptionMenu "CompatPhysicsMenu" protected OptionMenu "CompatPhysicsMenu" protected
{ {
Position -35
Title "$CMPTMNU_PHYSICSBEHAVIOR" Title "$CMPTMNU_PHYSICSBEHAVIOR"
Option "$CMPTMNU_NOPASSOVER", "compat_nopassover", "YesNo" Option "$CMPTMNU_NOPASSOVER", "compat_nopassover", "YesNo"
Option "$CMPTMNU_BOOMSCROLL", "compat_BOOMSCROLL", "YesNo" Option "$CMPTMNU_BOOMSCROLL", "compat_BOOMSCROLL", "YesNo"
@ -1657,6 +1665,7 @@ OptionMenu "CompatPhysicsMenu" protected
OptionMenu "CompatRenderMenu" protected OptionMenu "CompatRenderMenu" protected
{ {
Position -35
Title "$CMPTMNU_RENDERINGBEHAVIOR" Title "$CMPTMNU_RENDERINGBEHAVIOR"
Option "$CMPTMNU_POLYOBJ", "compat_POLYOBJ", "YesNo" Option "$CMPTMNU_POLYOBJ", "compat_POLYOBJ", "YesNo"
Option "$CMPTMNU_MASKEDMIDTEX", "compat_MASKEDMIDTEX", "YesNo" Option "$CMPTMNU_MASKEDMIDTEX", "compat_MASKEDMIDTEX", "YesNo"
@ -1666,6 +1675,7 @@ OptionMenu "CompatRenderMenu" protected
OptionMenu "CompatSoundMenu" protected OptionMenu "CompatSoundMenu" protected
{ {
Position -35
Title "$CMPTMNU_SOUNDBEHAVIOR" Title "$CMPTMNU_SOUNDBEHAVIOR"
Option "$CMPTMNU_SOUNDSLOTS", "compat_soundslots", "YesNo" Option "$CMPTMNU_SOUNDSLOTS", "compat_soundslots", "YesNo"
Option "$CMPTMNU_SILENTPICKUP", "compat_SILENTPICKUP", "YesNo" Option "$CMPTMNU_SILENTPICKUP", "compat_SILENTPICKUP", "YesNo"

4
wadsrc/static/zscript/ui/menu/optionmenu.zs
View file

@ -520,7 +520,7 @@ class GameplayMenu : OptionMenu
String s = String.Format("dmflags = %d dmflags2 = %d", dmflags, dmflags2); String s = String.Format("dmflags = %d dmflags2 = %d", dmflags, dmflags2);
screen.DrawText (OptionFont(), OptionMenuSettings.mFontColorValue, screen.DrawText (OptionFont(), OptionMenuSettings.mFontColorValue,
(screen.GetWidth() - OptionWidth (s) * CleanXfac_1) / 2, 0, s, (screen.GetWidth() - OptionWidth (s) * CleanXfac_1) / 2, 35 * CleanXfac_1, s,
DTA_CleanNoMove_1, true); DTA_CleanNoMove_1, true);
} }
} }
@ -533,7 +533,7 @@ class CompatibilityMenu : OptionMenu
String s = String.Format("compatflags = %d compatflags2 = %d", compatflags, compatflags2); String s = String.Format("compatflags = %d compatflags2 = %d", compatflags, compatflags2);
screen.DrawText (OptionFont(), OptionMenuSettings.mFontColorValue, screen.DrawText (OptionFont(), OptionMenuSettings.mFontColorValue,
(screen.GetWidth() - OptionWidth (s) * CleanXfac_1) / 2, 0, s, (screen.GetWidth() - OptionWidth (s) * CleanXfac_1) / 2, 35 * CleanXfac_1, s,
DTA_CleanNoMove_1, true); DTA_CleanNoMove_1, true);
} }
} }