From f1d73b54e94b3e3d2b342b864b84b32b12869af9 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sun, 24 Dec 2017 09:02:25 -0500 Subject: [PATCH] - fix botched zscript merge --- wadsrc/static/compatibility.txt | 11 +++ wadsrc/static/language.enu | 1 - wadsrc/static/menudef.txt | 89 ------------------- wadsrc/static/zscript.txt | 1 - .../static/zscript/menu/optionmenuitems.txt | 16 +--- 5 files changed, 14 insertions(+), 104 deletions(-) diff --git a/wadsrc/static/compatibility.txt b/wadsrc/static/compatibility.txt index f76ffebf6..245c45052 100644 --- a/wadsrc/static/compatibility.txt +++ b/wadsrc/static/compatibility.txt @@ -833,3 +833,14 @@ CA3773ED313E8899311F3DD0CA195A68 // e3m6 { polyobj } + +3D8ED20BF5CAAE6D6AE0E10999C75084 // hgarden.pk3 map01 +{ + // spawn trees on top of arches + setthingz 399 168 + setthingz 400 168 + setthingz 401 168 + setthingz 402 168 + setthingz 403 168 + setthingz 404 168 +} diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index bf04b2ec6..a147eeb80 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -1682,7 +1682,6 @@ OPTMNU_CHANGERENDER = "Change Rendering Output"; OPTMNU_DEFAULTS = "Reset to defaults"; OPTMNU_RESETTOSAVED = "Reset to last saved"; OPTMNU_CONSOLE = "Go to console"; -OPTMNU_REVERB = "Reverb environment editor"; // Controls Menu diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 85b4eda0f..faf57c054 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -1628,8 +1628,6 @@ OptionMenu SoundOptions protected StaticText " " Submenu "$SNDMNU_ADVANCED", "AdvSoundOptions" Submenu "$SNDMNU_MODREPLAYER", "ModReplayerOptions" - StaticText " " - Submenu "$OPTMNU_REVERB", "ReverbEdit" } /*======================================= @@ -2206,90 +2204,3 @@ OptionMenu "OpenGLOptions" protected Slider "$GLPREFMNU_PALTONEMAPPOWER", gl_paltonemap_powtable, 0.2, 3.0, 0.1, 1 Option "$GLPREFMNU_PALTONEMAPORDER", gl_paltonemap_reverselookup, "LookupOrder" } - -OptionMenu "ReverbEdit" protected -{ - Class "ReverbEdit" - Title "$OPTMNU_REVERB" - StaticTextSwitchable "", "", "EvironmentName", 1 - StaticTextSwitchable "", "", "EvironmentID" - StaticText " " - Submenu "Select Environment", "ReverbSelect" - Option "Test Environment", "eaxedit_test", OnOff - StaticText " " - Submenu "New Environment", "ReverbNew" - Submenu "Save Environments", "ReverbSave" - Submenu "Edit Environment", "ReverbSettings" -} - -OptionMenu "ReverbSelect" protected -{ - Class "ReverbSelect" - Title "Select Environment" - // filled in by code -} - -OptionMenu "ReverbSettings" protected -{ - Title "Edit Reverb Environment" - SafeCommand "Revert settings", "revertenvironment" - StaticText " " - SliderReverbEditOption "Environment Size", 1, 100, 0.01, 3, 1 - SliderReverbEditOption "Environment Diffusion", 0, 1, 0.01, 3, 2 - SliderReverbEditOption "Room", -10000, 0, 1, 0, 3 - SliderReverbEditOption "Room HF", -10000, 0, 1, 0, 4 - SliderReverbEditOption "Room LF", -10000, 0, 1, 0, 5 - SliderReverbEditOption "Decay Time", 1, 200, 0.01, 3, 6 - SliderReverbEditOption "Decay HF Ratio", 1, 20, 0.01, 3, 7 - SliderReverbEditOption "Decay LF Ratio", 1, 20, 0.01, 3, 8 - SliderReverbEditOption "Reflections", -10000, 1000, 1, 0, 9 - SliderReverbEditOption "Reflections Delay", 0, 0.3, 1, 3, 10 - SliderReverbEditOption "Reflections Pan X", -2000, 2000, 1, 3, 11 - SliderReverbEditOption "Reflections Pan Y", -2000, 2000, 1, 3, 12 - SliderReverbEditOption "Reflections Pan Z", -2000, 2000, 1, 3, 13 - SliderReverbEditOption "Reverb", -10000, 2000, 1, 0, 14 - SliderReverbEditOption "Reverb Delay", 0, 0.1, 0.01, 3, 15 - SliderReverbEditOption "Reverb Pan X", -2000, 2000, 1, 3, 16 - SliderReverbEditOption "Reverb Pan Y", -2000, 2000, 1, 3, 17 - SliderReverbEditOption "Reverb Pan Z", -2000, 2000, 1, 3, 18 - SliderReverbEditOption "Echo Time", 0.075, 0.25, 0.005, 3, 19 - SliderReverbEditOption "Echo Depth", 0, 1, 0.01, 3, 20 - SliderReverbEditOption "Modulation Time", 0.04, 4, 0.01, 3, 21 - SliderReverbEditOption "Modulation Depth",0, 1, 0.01, 3, 22 - SliderReverbEditOption "Air Absorption HF", -100, 0, 0.01, 3, 23 - SliderReverbEditOption "HF Reference", 10000, 200000, 1, 3, 24 - SliderReverbEditOption "LF Reference",20, 10000, 0.1, 3, 25 - SliderReverbEditOption "Room Rolloff Factor",0, 10, 0.01, 3, 26 - SliderReverbEditOption "Diffusion",0, 100, 0.01, 3, 27 - SliderReverbEditOption "Density",0, 100, 0.01, 3, 28 - StaticText " " - ReverbOption "Reflections Scale", 29, OnOff - ReverbOption "Reflections Delay Scale", 30, OnOff - ReverbOption "Decay Time Scale", 31, OnOff - ReverbOption "Decay HF Limit", 32, OnOff - ReverbOption "Reverb Scale", 33, OnOff - ReverbOption "Reverb Delay Scale", 34, OnOff - ReverbOption "Echo Time Scale", 35, OnOff - ReverbOption "Modulation Time Scale", 36, OnOff -} - -OptionMenu "ReverbNew" protected -{ - Title "New Reverb Environment" - ReverbSelect "Based on", "ReverbSelect" - TextField "Name", "reverbedit_name" - NumberField "ID #1", "reverbedit_id1", 0, 255 - NumberField "ID #2", "reverbedit_id2", 0, 255 - Command "Create", "createenvironment", 0, 1 -} - -OptionMenu "ReverbSave" protected -{ - Class "ReverbSave" - Title "Save Reverb Environments" - Command "Save...", "savereverbs" - TextField "File name", "reverbsavename" - StaticText "" - StaticText "Environments to save" - // Rest is filled in by code. -} \ No newline at end of file diff --git a/wadsrc/static/zscript.txt b/wadsrc/static/zscript.txt index 755e427dd..919e2f97f 100644 --- a/wadsrc/static/zscript.txt +++ b/wadsrc/static/zscript.txt @@ -25,7 +25,6 @@ version "3.3" #include "zscript/menu/videomenu.txt" #include "zscript/menu/readthis.txt" #include "zscript/menu/conversationmenu.txt" -#include "zscript/menu/reverbedit.txt" #include "zscript/statscreen/types.txt" #include "zscript/statscreen/statscreen.txt" diff --git a/wadsrc/static/zscript/menu/optionmenuitems.txt b/wadsrc/static/zscript/menu/optionmenuitems.txt index 2a9b91b13..3405ae549 100644 --- a/wadsrc/static/zscript/menu/optionmenuitems.txt +++ b/wadsrc/static/zscript/menu/optionmenuitems.txt @@ -150,11 +150,6 @@ class OptionMenuItemCommand : OptionMenuItemSubmenu } Menu.MenuSound("menu/choose"); DoCommand(ccmd); - if (mCloseOnSelect) - { - let curmenu = Menu.GetCurrentMenu(); - if (curmenu != null) curmenu.Close(); - } return true; } @@ -250,11 +245,11 @@ class OptionMenuItemOptionBase : OptionMenuItem virtual void SetSelection(int Selection) { } - + //============================================================================= override int Draw(OptionMenuDescriptor desc, int y, int indent, bool selected) { - bool grayed = isGrayed(); + bool grayed = mGrayCheck != null && !(mGrayCheck.GetInt()); if (mCenter) { @@ -299,15 +294,10 @@ class OptionMenuItemOptionBase : OptionMenuItem } return true; } - - virtual bool isGrayed() - { - return mGrayCheck != null && !mGrayCheck.GetInt(); - } override bool Selectable() { - return !isGrayed(); + return mGrayCheck == null || mGrayCheck.GetInt(); } }