[Scummvm-cvs-logs] scummvm master -> 4f6f0fb148133df632104071185efa049c7d5fea

[wjp]

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:
4f6f0fb148 SCI: Fix digital audio


Commit: 4f6f0fb148133df632104071185efa049c7d5fea
    https://github.com/scummvm/scummvm/commit/4f6f0fb148133df632104071185efa049c7d5fea
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-02-18T09:33:03+01:00

Commit Message:
SCI: Fix digital audio

Regression from 5028487038fd, where I assumed all songs were MIDI.

Changed paths:
    engines/sci/sound/soundcmd.cpp



diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 64991cb..ee5903f 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -186,7 +186,9 @@ void SoundCommandParser::processPlaySound(reg_t obj, bool playBed) {
 	musicSlot->loop = readSelectorValue(_segMan, obj, SELECTOR(loop));
 
 	// Get song priority from either obj or soundRes
-	byte resourcePriority = musicSlot->soundRes->getSoundPriority();
+	byte resourcePriority = 0xFF;
+	if (musicSlot->soundRes)
+		resourcePriority = musicSlot->soundRes->getSoundPriority();
 	if (!musicSlot->overridePriority && resourcePriority != 0xFF) {
 		musicSlot->priority = resourcePriority;
 	} else {