From 192b245d51ec3db542d9492f1f42154b730a32e4 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 6 Aug 2011 11:39:37 +0100
Subject: SCUMM: Fix compilation

---
 engines/scumm/scumm.cpp | 2 +-
 engines/scumm/sound.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 54c99144c8..283b527878 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 823a406a1e..33db70985d 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;
 
-- 
cgit v1.2.3