[Scummvm-cvs-logs] SF.net SVN: scummvm: [22342] scummvm/trunk/base

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Thu May 4 14:15:07 CEST 2006


Revision: 22342
Author:   fingolfin
Date:     2006-05-04 14:14:50 -0700 (Thu, 04 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22342&view=rev

Log Message:
-----------
Set speech_mute/sfx_mute/music_mute values in one single central place

Modified Paths:
--------------
    scummvm/trunk/base/gameDetector.cpp
    scummvm/trunk/engines/queen/queen.cpp
    scummvm/trunk/engines/sword2/sword2.cpp
Modified: scummvm/trunk/base/gameDetector.cpp
===================================================================
--- scummvm/trunk/base/gameDetector.cpp	2006-05-04 20:47:27 UTC (rev 22341)
+++ scummvm/trunk/base/gameDetector.cpp	2006-05-04 21:14:50 UTC (rev 22342)
@@ -169,6 +169,10 @@
 	ConfMan.registerDefault("sfx_volume", 192);
 	ConfMan.registerDefault("speech_volume", 192);
 
+	ConfMan.registerDefault("music_mute", false);
+	ConfMan.registerDefault("sfx_mute", false);
+	ConfMan.registerDefault("speech_mute", false);
+
 	ConfMan.registerDefault("multi_midi", false);
 	ConfMan.registerDefault("native_mt32", false);
 	ConfMan.registerDefault("enable_gs", false);
@@ -184,8 +188,6 @@
 //	ConfMan.registerDefault("amiga", false);
 	ConfMan.registerDefault("platform", Common::kPlatformPC);
 	ConfMan.registerDefault("language", "en");
-	ConfMan.registerDefault("speech_mute", false);
-	ConfMan.registerDefault("sfx_mute", false);
 	ConfMan.registerDefault("subtitles", false);
 	ConfMan.registerDefault("boot_param", 0);
 	ConfMan.registerDefault("dump_scripts", false);

Modified: scummvm/trunk/engines/queen/queen.cpp
===================================================================
--- scummvm/trunk/engines/queen/queen.cpp	2006-05-04 20:47:27 UTC (rev 22341)
+++ scummvm/trunk/engines/queen/queen.cpp	2006-05-04 21:14:50 UTC (rev 22342)
@@ -159,10 +159,7 @@
 }
 
 void QueenEngine::registerDefaultSettings() {
-	ConfMan.registerDefault("music_mute", false);
-	ConfMan.registerDefault("sfx_mute", false);
 	ConfMan.registerDefault("talkspeed", Logic::DEFAULT_TALK_SPEED);
-	ConfMan.registerDefault("speech_mute", _resource->isDemo() || _resource->isInterview());
 	ConfMan.registerDefault("subtitles", true);
 }
 

Modified: scummvm/trunk/engines/sword2/sword2.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sword2.cpp	2006-05-04 20:47:27 UTC (rev 22341)
+++ scummvm/trunk/engines/sword2/sword2.cpp	2006-05-04 21:14:50 UTC (rev 22342)
@@ -196,9 +196,6 @@
 }
 
 void Sword2Engine::registerDefaultSettings() {
-	ConfMan.registerDefault("music_mute", false);
-	ConfMan.registerDefault("speech_mute", false);
-	ConfMan.registerDefault("sfx_mute", false);
 	ConfMan.registerDefault("gfx_details", 2);
 	ConfMan.registerDefault("subtitles", false);
 	ConfMan.registerDefault("reverse_stereo", false);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list