[Scummvm-cvs-logs] scummvm master -> 192b245d51ec3db542d9492f1f42154b730a32e4

sev- sev at scummvm.org
Sat Aug 6 12:44:00 CEST 2011


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:
192b245d51 SCUMM: Fix compilation


Commit: 192b245d51ec3db542d9492f1f42154b730a32e4
    https://github.com/scummvm/scummvm/commit/192b245d51ec3db542d9492f1f42154b730a32e4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-08-06T03:39:37-07:00

Commit Message:
SCUMM: Fix compilation

Changed paths:
    engines/scumm/scumm.cpp
    engines/scumm/sound.cpp



diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 54c9914..283b527 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1754,7 +1754,7 @@ void ScummEngine::setupMusic(int midi) {
 		_sound->_musicType = MDT_PCJR;
 		break;
 	case MT_CMS:
-		_musicType = MDT_CMS;
+		_sound->_musicType = MDT_CMS;
 		break;
 	case MT_TOWNS:
 		_sound->_musicType = MDT_TOWNS;
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 823a406..33db709 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -2106,7 +2106,7 @@ int ScummEngine::readSoundResourceSmallHeader(ResId idx) {
 			_fileHandle->read(_res->createResource(rtSound, idx, wa_size + 6), wa_size + 6);
 		}
 		return 1;
-	} else if (_musicType == MDT_CMS) {
+	} else if (_sound->_musicType == MDT_CMS) {
 		if (_game.features & GF_OLD_BUNDLE) {
 			bool hasAdLibMusicTrack = false;
 






More information about the Scummvm-git-logs mailing list