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

Update LASTRUNVERSION to handle the snd_hrtf change 

Also snd_hrtf now uses -1 for "auto" and 0 for "off", which makes more sense.
This commit is contained in:
Chris Robinson 2017-04-30 12:01:38 -07:00 committed by Christoph Oelckers
parent 65399bf075
commit 6044c876ab
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gameconfigfile.cpp
View File

@ -378,9 +378,13 @@ void FGameConfigFile::DoGlobalSetup ()
if (var != NULL) var->ResetToDefault(); if (var != NULL) var->ResetToDefault();
var = FindCVar("uiscale", NULL); var = FindCVar("uiscale", NULL);
if (var != NULL) var->ResetToDefault(); if (var != NULL) var->ResetToDefault();
} }
if (last < 215)
{
// Previously a true/false boolean. Now an on/off/auto tri-state with auto as the default.
FBaseCVar *var = FindCVar("snd_hrtf", NULL);
if (var != NULL) var->ResetToDefault();
}
} }
} }
} }

2
src/sound/i_sound.cpp
View File

@ -66,7 +66,7 @@ EXTERN_CVAR (Float, snd_sfxvolume)
CVAR (Int, snd_samplerate, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR (Int, snd_samplerate, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CVAR (Int, snd_buffersize, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR (Int, snd_buffersize, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CVAR (String, snd_output, "default", CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR (String, snd_output, "default", CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CVAR (Int, snd_hrtf, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR (Int, snd_hrtf, -1, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
#if !defined(NO_OPENAL) #if !defined(NO_OPENAL)
#define DEF_BACKEND "openal" #define DEF_BACKEND "openal"

2
src/sound/oalsound.cpp
View File

@ -756,7 +756,7 @@ OpenALSoundRenderer::OpenALSoundRenderer()
if(ALC.SOFT_HRTF) if(ALC.SOFT_HRTF)
{ {
attribs.Push(ALC_HRTF_SOFT); attribs.Push(ALC_HRTF_SOFT);
if(*snd_hrtf < 0) if(*snd_hrtf == 0)
attribs.Push(ALC_FALSE); attribs.Push(ALC_FALSE);
else if(*snd_hrtf > 0) else if(*snd_hrtf > 0)
attribs.Push(ALC_TRUE); attribs.Push(ALC_TRUE);

2
src/version.h
View File

@ -68,7 +68,7 @@ const char *GetVersionString();
// Version stored in the ini's [LastRun] section. // Version stored in the ini's [LastRun] section.
// Bump it if you made some configuration change that you want to // Bump it if you made some configuration change that you want to
// be able to migrate in FGameConfigFile::DoGlobalSetup(). // be able to migrate in FGameConfigFile::DoGlobalSetup().
#define LASTRUNVERSION "214" #define LASTRUNVERSION "215"
// Protocol version used in demos. // Protocol version used in demos.
// Bump it if you change existing DEM_ commands or add new ones. // Bump it if you change existing DEM_ commands or add new ones.

8
wadsrc/static/menudef.txt
View File

@ -309,10 +309,10 @@ OptionValue "OffOn"
1, "$OPTVAL_OFF" 1, "$OPTVAL_OFF"
} }
OptionValue OffAutoOn OptionValue AutoOffOn
{ {
-1, "$OPTVAL_OFF" -1, "$OPTVAL_AUTO"
0, "$OPTVAL_AUTO" 0, "$OPTVAL_OFF"
1, "$OPTVAL_ON" 1, "$OPTVAL_ON"
} }
@ -1636,7 +1636,7 @@ OptionMenu AdvSoundOptions
{ {
Title "$ADVSNDMNU_TITLE" Title "$ADVSNDMNU_TITLE"
Option "$ADVSNDMNU_SAMPLERATE", "snd_samplerate", "SampleRates" Option "$ADVSNDMNU_SAMPLERATE", "snd_samplerate", "SampleRates"
Option "$ADVSNDMNU_HRTF", "snd_hrtf", "OffAutoOn" Option "$ADVSNDMNU_HRTF", "snd_hrtf", "AutoOffOn"
StaticText " " StaticText " "
StaticText "$ADVSNDMNU_OPLSYNTHESIS", 1 StaticText "$ADVSNDMNU_OPLSYNTHESIS", 1
Slider "$ADVSNDMNU_OPLNUMCHIPS", "opl_numchips", 1, 8, 1, 0 Slider "$ADVSNDMNU_OPLNUMCHIPS", "opl_numchips", 1, 8, 1, 0