[Scummvm-cvs-logs] scummvm master -> fdb2f735dc325269e006a7eb87472c7e3a3ac61f

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fdb2f735dc SCUMM: Remove unneeded check for CMS in readSoundResource.


Commit: fdb2f735dc325269e006a7eb87472c7e3a3ac61f
    https://github.com/scummvm/scummvm/commit/fdb2f735dc325269e006a7eb87472c7e3a3ac61f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-08T11:15:24-07:00

Commit Message:
SCUMM: Remove unneeded check for CMS in readSoundResource.

CMS support is only available in games using readSoundResourceSmallHeader.

Changed paths:
    engines/scumm/sound.cpp



diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 33db709..50ae045 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -1144,10 +1144,10 @@ int ScummEngine::readSoundResource(ResId idx) {
 				break;
 			}
 
-			// We only allow SPK resources for PC Speaker, PCJr and CMS here
+			// We only allow SPK resources for PC Speaker and PCJr here
 			// since other resource would sound horribly with their output
 			// drivers.
-			if ((_sound->_musicType == MDT_PCSPK || _sound->_musicType == MDT_PCJR || _sound->_musicType == MDT_CMS) && pri != 11)
+			if ((_sound->_musicType == MDT_PCSPK || _sound->_musicType == MDT_PCJR) && pri != 11)
 				pri = -1;
 
 			// We only allow ADL resources when AdLib or FM-Towns is used as