aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/sound.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 1461f98bfb..c95f829f21 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -179,8 +179,13 @@ void Sound::playSound(int soundID) {
ptr = _scumm->getResourceAddress(rtSound, soundID);
if (ptr) {
if (READ_UINT32_UNALIGNED(ptr) == MKID('iMUS')){
- if (_scumm->_imuseDigital)
- _scumm->_imuseDigital->startSound(soundID);
+ assert(_scumm->_imuseDigital);
+ _scumm->_imuseDigital->startSound(soundID);
+ return;
+ }
+ else if (READ_UINT32_UNALIGNED(ptr) == MKID('Crea')) {
+ assert(_scumm->_imuseDigital);
+ _scumm->_imuseDigital->startSound(soundID);
return;
}
else if (READ_UINT32_UNALIGNED(ptr) == MKID('SOUN')) {
@@ -259,10 +264,6 @@ void Sound::playSound(int soundID) {
return;
}
- else if (READ_UINT32_UNALIGNED(ptr) == MKID('Crea')) {
- _scumm->_imuseDigital->startSound(soundID);
- return;
- }
else if (READ_UINT32_UNALIGNED(ptr) == MKID('ADL ')) {
// played as MIDI, just to make perhaps the later use
// of WA possible (see "else if" with GF_OLD256 below)