From d5445d795395107f0a11f16f81356d2a8e97039d Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 3 Dec 2017 19:56:03 +0100
Subject: [PATCH] - reverb editor complete except for localization and saving
 to a proper place.

---
 src/s_environment.cpp     | 8 ++++----
 wadsrc/static/menudef.txt | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/s_environment.cpp b/src/s_environment.cpp
index cf2da7c5e..860c1d024 100644
--- a/src/s_environment.cpp
+++ b/src/s_environment.cpp
@@ -59,7 +59,7 @@ extern ReverbContainer *ForcedEnvironment;
 CVAR(String, reverbedit_name, "", CVAR_NOSET);
 CVAR(Int, reverbedit_id1, 0, CVAR_NOSET);
 CVAR(Int, reverbedit_id2, 0, CVAR_NOSET);
-CVAR(String, reverbsavename, "", CVAR_NOSET);
+CVAR(String, reverbsavename, "", 0);
 
 struct FReverbField
 {
@@ -836,7 +836,7 @@ FString SuggestNewName(const ReverbContainer *env)
 
 void ExportEnvironments(const char *filename, uint32_t count, const ReverbContainer **envs)
 {
-	FileWriter *f = FileWriter::Open("filename");
+	FileWriter *f = FileWriter::Open(filename);
 
 	if (f != nullptr)
 	{
@@ -977,7 +977,7 @@ DEFINE_ACTION_FUNCTION(DReverbEdit, FillSelectMenu)
 	PARAM_PROLOGUE;
 	PARAM_STRING(ccmd);
 	PARAM_OBJECT(desc, DOptionMenuDescriptor);
-	desc->mItems.Resize(2);
+	desc->mItems.Clear();
 	for (auto env = Environments; env != nullptr; env = env->Next)
 	{
 		FStringf text("(%d, %d) %s", HIBYTE(env->ID), LOBYTE(env->ID), env->Name);
@@ -1004,7 +1004,7 @@ DEFINE_ACTION_FUNCTION(DReverbEdit, FillSaveMenu)
 {
 	PARAM_PROLOGUE;
 	PARAM_OBJECT(desc, DOptionMenuDescriptor);
-	desc->mItems.Clear();
+	desc->mItems.Resize(4);
 	SaveState.Clear();
 	for (auto env = Environments; env != nullptr; env = env->Next)
 	{
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index c7a147399..d4a4916ae 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -354,8 +354,6 @@ OptionMenu "OptionsMenu" protected
 	Submenu "$OPTMNU_VIDEO",			"VideoModeMenu"
 	Submenu "$OPTMNU_CHANGERENDER",		"RendererMenu"
 	StaticText " "
-	Submenu "$OPTMNU_REVERB",			"ReverbEdit"
-	StaticText " "
 	SafeCommand "$OPTMNU_DEFAULTS",	"reset2defaults"
 	SafeCommand	"$OPTMNU_RESETTOSAVED",	"reset2saved"
 	Command "$OPTMNU_CONSOLE",			"menuconsole"
@@ -1629,6 +1627,8 @@ OptionMenu SoundOptions protected
 	StaticText " "
 	Submenu "$SNDMNU_ADVANCED",			"AdvSoundOptions"
 	Submenu "$SNDMNU_MODREPLAYER",		"ModReplayerOptions"
+	StaticText " "
+	Submenu "$OPTMNU_REVERB",			"ReverbEdit"
 }
 
 /*=======================================
@@ -2287,6 +2287,7 @@ 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.