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

[lordhoto at users.sourceforge.net]

Revision: 30823
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30823&view=rev
Author:   lordhoto
Date:     2008-02-07 15:31:13 -0800 (Thu, 07 Feb 2008)

Log Message:
-----------
Fixed kyra3 related regression (should show the menu now again).

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

Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp	2008-02-07 23:27:08 UTC (rev 30822)
+++ scummvm/trunk/engines/kyra/kyra.cpp	2008-02-07 23:31:13 UTC (rev 30823)
@@ -241,7 +241,13 @@
 
 void KyraEngine::readSettings() {
 	_configWalkspeed = ConfMan.getInt("walkspeed");
-	_configMusic = ConfMan.getBool("music_mute") ? 0 : ((ConfMan.getBool("cdaudio") && (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98)) ? 2 : 1);
+	_configMusic = 0;
+	
+	if (!ConfMan.getBool("music_mute")) {
+		_configMusic = 1;
+		if (_flags.gameID != GI_KYRA3 && ConfMan.getBool("cdaudio") && (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98))
+			_configMusic = 2;
+	}
 	_configSounds = ConfMan.getBool("sfx_mute") ? 0 : 1;
 
 	_sound->enableMusic(_configMusic);
@@ -265,7 +271,8 @@
 
 	ConfMan.setInt("walkspeed", _configWalkspeed);
 	ConfMan.setBool("music_mute", _configMusic == 0);
-	ConfMan.setBool("cdaudio", _configMusic == 2);
+	if (_flags.gameID != GI_KYRA3)
+		ConfMan.setBool("cdaudio", _configMusic == 2);
 	ConfMan.setBool("sfx_mute", _configSounds == 0);
 
 	switch (_configVoice) {


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