[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.93,1.94

[Max Horn]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24676/base

Modified Files:
	gameDetector.cpp 
Log Message:
Get rid of the useless & troublesome master_volume

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- gameDetector.cpp	24 Dec 2004 00:31:51 -0000	1.93
+++ gameDetector.cpp	25 Dec 2004 23:43:04 -0000	1.94
@@ -70,7 +70,6 @@
 	"  -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 @@
 	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 @@
 				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);