[Scummvm-cvs-logs] SF.net SVN: scummvm:[34522] scummvm/trunk/engines/kyra/kyra_v1.cpp

[lordhoto at users.sourceforge.net]

Revision: 34522
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34522&view=rev
Author:   lordhoto
Date:     2008-09-14 14:58:37 +0000 (Sun, 14 Sep 2008)

Log Message:
-----------
Only setup 'cdaudio' config default for FM-Towns/PC98.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v1.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-09-14 14:08:14 UTC (rev 34521)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-09-14 14:58:37 UTC (rev 34522)
@@ -247,8 +247,8 @@
 }
 
 void KyraEngine_v1::registerDefaultSettings() {
-	if (_flags.gameID != GI_KYRA3)
-		ConfMan.registerDefault("cdaudio", (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98));
+	if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98)
+		ConfMan.registerDefault("cdaudio", true);
 	if (_flags.fanLang != Common::UNK_LANG) {
 		// HACK/WORKAROUND: Since we can't use registerDefault here to overwrite
 		// the global subtitles settings, we're using this hack to enable subtitles
@@ -265,7 +265,7 @@
 	
 	if (!ConfMan.getBool("music_mute")) {
 		_configMusic = 1;
-		if (_flags.gameID != GI_KYRA3 && ConfMan.getBool("cdaudio") && (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98))
+		if (ConfMan.getBool("cdaudio") && (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98))
 			_configMusic = 2;
 	}
 	_configSounds = ConfMan.getBool("sfx_mute") ? 0 : 1;


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