zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- reverb editor complete except for localization and saving to a proper place.

This commit is contained in:
Christoph Oelckers 2017-12-03 19:56:03 +01:00
parent 5e1100096e
commit d5445d7953
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/s_environment.cpp
View File

@ -59,7 +59,7 @@ extern ReverbContainer *ForcedEnvironment;
CVAR(String, reverbedit_name, "", CVAR_NOSET); CVAR(String, reverbedit_name, "", CVAR_NOSET);
CVAR(Int, reverbedit_id1, 0, CVAR_NOSET); CVAR(Int, reverbedit_id1, 0, CVAR_NOSET);
CVAR(Int, reverbedit_id2, 0, CVAR_NOSET); CVAR(Int, reverbedit_id2, 0, CVAR_NOSET);
CVAR(String, reverbsavename, "", CVAR_NOSET); CVAR(String, reverbsavename, "", 0);
struct FReverbField struct FReverbField
{ {
@ -836,7 +836,7 @@ FString SuggestNewName(const ReverbContainer *env)
void ExportEnvironments(const char *filename, uint32_t count, const ReverbContainer **envs) void ExportEnvironments(const char *filename, uint32_t count, const ReverbContainer **envs)
{ {
FileWriter *f = FileWriter::Open("filename"); FileWriter *f = FileWriter::Open(filename);
if (f != nullptr) if (f != nullptr)
{ {
@ -977,7 +977,7 @@ DEFINE_ACTION_FUNCTION(DReverbEdit, FillSelectMenu)
PARAM_PROLOGUE; PARAM_PROLOGUE;
PARAM_STRING(ccmd); PARAM_STRING(ccmd);
PARAM_OBJECT(desc, DOptionMenuDescriptor); PARAM_OBJECT(desc, DOptionMenuDescriptor);
desc->mItems.Resize(2); desc->mItems.Clear();
for (auto env = Environments; env != nullptr; env = env->Next) for (auto env = Environments; env != nullptr; env = env->Next)
{ {
FStringf text("(%d, %d) %s", HIBYTE(env->ID), LOBYTE(env->ID), env->Name); 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_PROLOGUE;
PARAM_OBJECT(desc, DOptionMenuDescriptor); PARAM_OBJECT(desc, DOptionMenuDescriptor);
desc->mItems.Clear(); desc->mItems.Resize(4);
SaveState.Clear(); SaveState.Clear();
for (auto env = Environments; env != nullptr; env = env->Next) for (auto env = Environments; env != nullptr; env = env->Next)
{ {

5
wadsrc/static/menudef.txt
View File

@ -354,8 +354,6 @@ OptionMenu "OptionsMenu" protected
Submenu "$OPTMNU_VIDEO", "VideoModeMenu" Submenu "$OPTMNU_VIDEO", "VideoModeMenu"
Submenu "$OPTMNU_CHANGERENDER", "RendererMenu" Submenu "$OPTMNU_CHANGERENDER", "RendererMenu"
StaticText " " StaticText " "
Submenu "$OPTMNU_REVERB", "ReverbEdit"
StaticText " "
SafeCommand "$OPTMNU_DEFAULTS", "reset2defaults" SafeCommand "$OPTMNU_DEFAULTS", "reset2defaults"
SafeCommand "$OPTMNU_RESETTOSAVED", "reset2saved" SafeCommand "$OPTMNU_RESETTOSAVED", "reset2saved"
Command "$OPTMNU_CONSOLE", "menuconsole" Command "$OPTMNU_CONSOLE", "menuconsole"
@ -1629,6 +1627,8 @@ OptionMenu SoundOptions protected
StaticText " " StaticText " "
Submenu "$SNDMNU_ADVANCED", "AdvSoundOptions" Submenu "$SNDMNU_ADVANCED", "AdvSoundOptions"
Submenu "$SNDMNU_MODREPLAYER", "ModReplayerOptions" Submenu "$SNDMNU_MODREPLAYER", "ModReplayerOptions"
StaticText " "
Submenu "$OPTMNU_REVERB", "ReverbEdit"
} }
/*======================================= /*=======================================
@ -2287,6 +2287,7 @@ OptionMenu "ReverbSave" protected
Class "ReverbSave" Class "ReverbSave"
Title "Save Reverb Environments" Title "Save Reverb Environments"
Command "Save...", "savereverbs" Command "Save...", "savereverbs"
TextField "File name", "reverbsavename"
StaticText "" StaticText ""
StaticText "Environments to save" StaticText "Environments to save"
// Rest is filled in by code. // Rest is filled in by code.