diff options
| author | Eugene Sandulenko | 2017-02-11 08:56:16 +0100 |
|---|---|---|
| committer | GitHub | 2017-02-11 08:56:16 +0100 |
| commit | 3d5d279bed2556cba0286185fcafbf85743d1d03 (patch) | |
| tree | 43afb2b2ed8fd892fb186e6d54befde38bc28541 /common | |
| parent | 74222486250c777624c3d510b2d57024dba569b8 (diff) | |
| parent | d1fe6476fe800b2ea796757a54dd2b974e7be365 (diff) | |
| download | scummvm-rg350-3d5d279bed2556cba0286185fcafbf85743d1d03.tar.gz scummvm-rg350-3d5d279bed2556cba0286185fcafbf85743d1d03.tar.bz2 scummvm-rg350-3d5d279bed2556cba0286185fcafbf85743d1d03.zip | |
Merge pull request #895 from csnover/gui-volume-options
GUI: Add three new options for volume slider controls
Diffstat (limited to 'common')
| -rw-r--r-- | common/gui_options.cpp | 5 | ||||
| -rw-r--r-- | common/gui_options.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/common/gui_options.cpp b/common/gui_options.cpp index df880f4fee..120edd0b91 100644 --- a/common/gui_options.cpp +++ b/common/gui_options.cpp @@ -29,6 +29,8 @@ namespace Common { const struct GameOpt { const char *option; + // Each description must be a unique identifier not containing a substring + // of any other description const char *desc; } g_gameOptions[] = { { GUIO_NOSUBTITLES, "sndNoSubs" }, @@ -36,6 +38,9 @@ const struct GameOpt { { GUIO_NOSPEECH, "sndNoSpeech" }, { GUIO_NOSFX, "sndNoSFX" }, { GUIO_NOMIDI, "sndNoMIDI" }, + { GUIO_LINKSPEECHTOSFX, "sndLinkSpeechToSfx" }, + { GUIO_LINKMUSICTOSFX, "sndLinkMusicToSfx" }, + { GUIO_NOSPEECHVOLUME, "sndNoSpchVolume" }, { GUIO_NOLAUNCHLOAD, "launchNoLoad" }, diff --git a/common/gui_options.h b/common/gui_options.h index d17f45cac1..d51a29ad75 100644 --- a/common/gui_options.h +++ b/common/gui_options.h @@ -26,6 +26,7 @@ #define GUIO_NONE "\000" #define GUIO_NOSUBTITLES "\001" #define GUIO_NOMUSIC "\002" +// GUIO_NOSPEECH is a combination of GUIO_NOSPEECHVOLUME and GUIO_NOSUBTITLES #define GUIO_NOSPEECH "\003" #define GUIO_NOSFX "\004" #define GUIO_NOMIDI "\005" @@ -58,6 +59,10 @@ #define GUIO_RENDERATARIST "\042" #define GUIO_RENDERMACINTOSH "\043" +#define GUIO_LINKSPEECHTOSFX "\044" +#define GUIO_LINKMUSICTOSFX "\045" +#define GUIO_NOSPEECHVOLUME "\046" + // Special GUIO flags for the AdvancedDetector's caching of game specific // options. #define GUIO_GAMEOPTIONS1 "\050" |