diff options
| author | Travis Howell | 2004-08-24 00:58:28 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-08-24 00:58:28 +0000 |
| commit | bdd0dfef430b11b35199a0bd472dfeefd608e0e1 (patch) | |
| tree | 9eab4eedd14210a1855e93afd145bb2582b4bf6f /scumm/sound.cpp | |
| parent | 400582bd9d67588c951bd06ced6be18760a590b5 (diff) | |
| download | scummvm-rg350-bdd0dfef430b11b35199a0bd472dfeefd608e0e1.tar.gz scummvm-rg350-bdd0dfef430b11b35199a0bd472dfeefd608e0e1.tar.bz2 scummvm-rg350-bdd0dfef430b11b35199a0bd472dfeefd608e0e1.zip | |
init var.
avoid valgrind warning
svn-id: r14722
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
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; |