zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-03-17 08:21:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-merge branch 'reverbedit'

Browse source
This commit is contained in:
Christoph Oelckers 2018-01-20 13:06:26 +01:00 committed by Rachael Alexanderson
parent 00e51dc16f
commit 103aa648cd
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/s_environment.cpp
View file

@ -903,9 +903,9 @@ DEFINE_ACTION_FUNCTION(DReverbEdit, GetValue)
{
PARAM_PROLOGUE;
PARAM_INT(index);
float v = 0;
float v;
if (index >= 0 && index < (int)countof(ReverbFields))
if (index >= 0 && index < countof(ReverbFields))
{
auto rev = &ReverbFields[index];
if (rev->Int != nullptr)
@ -931,7 +931,7 @@ DEFINE_ACTION_FUNCTION(DReverbEdit, SetValue)
PARAM_INT(index);
PARAM_FLOAT(v);
if (index >= 0 && index < (int)countof(ReverbFields))
if (index >= 0 && index < countof(ReverbFields))
{
auto rev = &ReverbFields[index];
if (rev->Int != nullptr)

1
wadsrc/static/language.enu
View file

@ -1682,6 +1682,7 @@ 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

1
wadsrc/static/zscript.txt
View file

@ -25,6 +25,7 @@ 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"