aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2004-12-25 23:43:05 +0000
committerMax Horn2004-12-25 23:43:05 +0000
commit81b6e9e1e6119c85e8b21739fea3580183154e5d (patch)
tree90ff4fbc56afcee2ed328c3371511083f2710107 /base
parent65ca0a07289216d7183f86b8d3b76f0033c8d34e (diff)
downloadscummvm-rg350-81b6e9e1e6119c85e8b21739fea3580183154e5d.tar.gz
scummvm-rg350-81b6e9e1e6119c85e8b21739fea3580183154e5d.tar.bz2
scummvm-rg350-81b6e9e1e6119c85e8b21739fea3580183154e5d.zip
Get rid of the useless & troublesome master_volume
svn-id: r16328
Diffstat (limited to 'base')
-rw-r--r--base/gameDetector.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index f589d9522a..bbee79d7f2 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -70,7 +70,6 @@ static const char USAGE_STRING[] =
" -q, --language=LANG Select language (en,de,fr,it,pt,es,jp,zh,kr,se,gb,\n"
" hb,ru,cz)\n"
" -m, --music-volume=NUM Set the music volume, 0-255 (default: 192)\n"
- " -o, --master-volume=NUM Set the master volume, 0-255 (default: 192)\n"
" -s, --sfx-volume=NUM Set the sfx volume, 0-255 (default: 192)\n"
" -r, --speech-volume=NUM Set the speech volume, 0-255 (default: 192)\n"
" -n, --subtitles Enable subtitles (use with games that have voice)\n"
@@ -118,7 +117,6 @@ GameDetector::GameDetector() {
ConfMan.registerDefault("gfx_mode", "normal");
// Sound & Music
- ConfMan.registerDefault("master_volume", 192);
ConfMan.registerDefault("music_volume", 192);
ConfMan.registerDefault("sfx_volume", 192);
ConfMan.registerDefault("speech_volume", 192);
@@ -394,10 +392,6 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
ConfMan.set("subtitles", cmdValue, kTransientDomain);
END_OPTION
- DO_OPTION('o', "master-volume")
- ConfMan.set("master_volume", (int)strtol(option, 0, 10), kTransientDomain);
- END_OPTION
-
DO_OPTION('p', "path")
// TODO: Verify whether the path is valid
ConfMan.set("path", option, kTransientDomain);