diff options
| -rw-r--r-- | scumm/scumm.cpp | 1 | ||||
| -rw-r--r-- | scumm/sound.cpp | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 2b28d8fee8..1dbdacfd7c 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -638,6 +638,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _2byteFontPtr = 0; _V1_talkingActor = 0; + _skipDrawObject = 0; _heSndSoundId = 0; _heSndOffset = 0; _heSndTimer = 0; diff --git a/scumm/sound.cpp b/scumm/sound.cpp index d32301bd8e..14a13e8e18 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -162,10 +162,9 @@ void Sound::playSound(int soundID, int offset) { byte flags = SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE; bool music = false; - debugC(DEBUG_SOUND, "playSound #%d (room %d)", soundID, - _vm->getResourceRoomNr(rtSound, soundID)); - if ((_vm->_heversion >= 70) && soundID >= 4000) { + debugC(DEBUG_SOUND, "playSound #%d", soundID); + int music_offs, total_size; char buf[32]; File musicFile; @@ -212,8 +211,12 @@ void Sound::playSound(int soundID, int offset) { _vm->_mixer->playRaw(&_musicChannelHandle, sound, size, 11025, flags, soundID); return; } - } else + } else { + debugC(DEBUG_SOUND, "playSound #%d (room %d)", soundID, + _vm->getResourceRoomNr(rtSound, soundID)); + ptr = _vm->getResourceAddress(rtSound, soundID); + } if (!ptr) { return; |