diff options
| author | Max Horn | 2003-05-03 20:45:31 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-03 20:45:31 +0000 |
| commit | b3eb397ad23a7d111d7b56cae45051ad4fb1dc04 (patch) | |
| tree | 38a1450d210928a6586c9d7a1d217f6ab0a26e8f /scumm/sound.cpp | |
| parent | 7e58986519a8036f920b76b8a232eeb235adb901 (diff) | |
| download | scummvm-rg350-b3eb397ad23a7d111d7b56cae45051ad4fb1dc04.tar.gz scummvm-rg350-b3eb397ad23a7d111d7b56cae45051ad4fb1dc04.tar.bz2 scummvm-rg350-b3eb397ad23a7d111d7b56cae45051ad4fb1dc04.zip | |
reordered iMuseDigital stuff to be next to each other
svn-id: r7289
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 13 |
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) |