[Scummvm-cvs-logs] SF.net SVN: scummvm:[46584] scummvm/trunk/engines/sci/engine/ksound.cpp

[thebluegr at users.sourceforge.net]

Revision: 46584
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46584&view=rev
Author:   thebluegr
Date:     2009-12-26 13:50:52 +0000 (Sat, 26 Dec 2009)

Log Message:
-----------
Case kSciAudioLanguage in kDoAudio always checks for audio capability in SCI1.1 games, regardless of parameters. Fixes a warning in SQ4CD

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/ksound.cpp

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2009-12-26 13:48:14 UTC (rev 46583)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2009-12-26 13:50:52 UTC (rev 46584)
@@ -135,12 +135,11 @@
 		mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, argv[1].toUint16());
 		break;
 	case kSciAudioLanguage:
-		if (argc == 1) {
-			// In SCI1.1: tests for digital audio support
+		// In SCI1.1: tests for digital audio support
+		if (getSciVersion() == SCI_VERSION_1_1)
 			return make_reg(0, 1);
-		} else {
+		else
 			s->resMan->setAudioLanguage(argv[1].toSint16());
-		}
 		break;
 	case kSciAudioCD:
 		return kDoCdAudio(s, argc - 1, argv + 1);


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