Skip to content

Commit

Permalink
- adapt mod_dumb_mastervolume to the increased default volume in ZMusic.
Browse files Browse the repository at this point in the history
  • Loading branch information
coelckers committed Mar 14, 2021
1 parent f0ddc06 commit a80775a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
10 changes: 10 additions & 0 deletions src/gameconfigfile.cpp
Expand Up @@ -600,6 +600,16 @@ void FGameConfigFile::DoGlobalSetup ()
old_targets |= (old_targets & 1) ? 8 : 0;
gl_texture_hqresize_targets = old_targets;
}
if (last < 222)
{
auto var = FindCVar("mod_dumb_mastervolume", NULL);
if (var != NULL)
{
UCVarValue v = var->GetGenericRep(CVAR_Float);
v.Float /= 4.f;
if (v.Float < 1.f) v.Float = 1.f;
}
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
Expand Up @@ -65,7 +65,7 @@ const char *GetVersionString();
// Version stored in the ini's [LastRun] section.
// Bump it if you made some configuration change that you want to
// be able to migrate in FGameConfigFile::DoGlobalSetup().
#define LASTRUNVERSION "221"
#define LASTRUNVERSION "222"

// Protocol version used in demos.
// Bump it if you change existing DEM_ commands or add new ones.
Expand Down
2 changes: 1 addition & 1 deletion wadsrc/static/menudef.txt
Expand Up @@ -2052,7 +2052,7 @@ OptionValue ModVolumeRamps
OptionMenu ModReplayerOptions protected
{
Title "$MODMNU_TITLE"
Slider "$MODMNU_MASTERVOLUME", "mod_dumb_mastervolume", 1, 16, 0.5, 1
Slider "$MODMNU_MASTERVOLUME", "mod_dumb_mastervolume", 0.25, 4, 0.5, 1
Option "$ADVSNDMNU_SAMPLERATE", "mod_samplerate", "SampleRates"
Option "$MODMNU_QUALITY", "mod_interp", "ModQuality"
Option "$MODMNU_VOLUMERAMPING", "mod_volramp", "ModVolumeRamps"
Expand Down

0 comments on commit a80775a

Please sign in to comment.