1 files changed, 45 insertions, 1 deletions

diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index a25505fe47..e6b8fd06c2 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -61,7 +61,7 @@ AudioVolumeResourceSource::AudioVolumeResourceSource(ResourceManager *resMan, co
 		// Now read the whole offset mapping table for later usage
 		int32 recordCount = fileStream->readUint32LE();
 		if (!recordCount)
-			error("compressed audio volume doesn't contain any entries!");
+			error("compressed audio volume doesn't contain any entries");
 		int32 *offsetMapping = new int32[(recordCount + 1) * 2];
 		_audioCompressionOffsetMapping = offsetMapping;
 		for (int recordNo = 0; recordNo < recordCount; recordNo++) {
@@ -273,6 +273,13 @@ void ResourceManager::removeAudioResource(ResourceId resId) {
 // w syncAscSize (iff seq has bit 6 set)
 
 int ResourceManager::readAudioMapSCI11(ResourceSource *map) {
+#ifndef ENABLE_SCI32
+	// SCI32 support is not built in. Check if this is a SCI32 game
+	// and if it is abort here.
+	if (_volVersion == kResVersionSci32)
+		return SCI_ERROR_RESMAP_NOT_FOUND;
+#endif
+
 	uint32 offset = 0;
 	Resource *mapRes = findResource(ResourceId(kResourceTypeMap, map->_volumeNumber), false);
 
@@ -519,6 +526,41 @@ int ResourceManager::getAudioLanguage() const {
 	return (_audioMapSCI1 ? _audioMapSCI1->_volumeNumber : 0);
 }
 
+bool ResourceManager::isGMTrackIncluded() {
+	// This check only makes sense for SCI1 and newer games
+	if (getSciVersion() < SCI_VERSION_1_EARLY)
+		return false;
+
+	// SCI2 and newer games always have GM tracks
+	if (getSciVersion() >= SCI_VERSION_2)
+		return true;
+
+	// For the leftover games, we can safely use SCI_VERSION_1_EARLY for the soundVersion
+	const SciVersion soundVersion = SCI_VERSION_1_EARLY;
+
+	// Read the first song and check if it has a GM track
+	bool result = false;
+	Common::List<ResourceId> *resources = listResources(kResourceTypeSound, -1);
+	Common::sort(resources->begin(), resources->end());
+	Common::List<ResourceId>::iterator itr = resources->begin();
+	int firstSongId = itr->getNumber();
+	delete resources;
+
+	SoundResource *song1 = new SoundResource(firstSongId, this, soundVersion);
+	if (!song1) {
+		warning("ResourceManager::isGMTrackIncluded: track 1 not found");
+		return false;
+	}
+
+	SoundResource::Track *gmTrack = song1->getTrackByType(0x07);
+	if (gmTrack)
+		result = true;
+
+	delete song1;
+
+	return result;
+}
+
 SoundResource::SoundResource(uint32 resourceNr, ResourceManager *resMan, SciVersion soundVersion) : _resMan(resMan), _soundVersion(soundVersion) {
 	Resource *resource = _resMan->findResource(ResourceId(kResourceTypeSound, resourceNr), true);
 	int trackNr, channelNr;
@@ -629,6 +671,8 @@ SoundResource::SoundResource(uint32 resourceNr, ResourceManager *resMan, SciVers
 						channel->data = resource->data + dataOffset;
 						channel->size = READ_LE_UINT16(data + 4);
 						channel->curPos = 0;
+						// FIXME: number contains (low nibble) channel and (high nibble) flags
+						// 0x20 is set on rhythm channels to prevent remapping
 						channel->number = *channel->data;
 						channel->poly = *(channel->data + 1);
 						channel->time = channel->prev = 0;