aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorColin Snover2017-01-25 20:36:42 -0600
committerColin Snover2017-02-05 10:41:28 -0600
commitd1fe6476fe800b2ea796757a54dd2b974e7be365 (patch)
treeaaf285643a0cf94900c0407c29541fd96e4cb056 /common
parenta44720e565a2456ebc2f054af9751d109bd3f5fd (diff)
downloadscummvm-rg350-d1fe6476fe800b2ea796757a54dd2b974e7be365.tar.gz
scummvm-rg350-d1fe6476fe800b2ea796757a54dd2b974e7be365.tar.bz2
scummvm-rg350-d1fe6476fe800b2ea796757a54dd2b974e7be365.zip
GUI: Add three new options for volume slider controls
GUIO_NOSPEECHVOLUME can be used for games that allow toggling of speech but do not provide the ability for users to control speech volume. GUIO_LINKMUSICTOSFX and GUI_LINKSPEECHTOSFX can be used for games that allow control of music, sfx, and speech in combinations, like games that provide control of digital audio separately from MIDI, or games that only control all three audio types through a single volume control.
Diffstat (limited to 'common')
-rw-r--r--common/gui_options.cpp5
-rw-r--r--common/gui_options.h5
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"