From bdd0dfef430b11b35199a0bd472dfeefd608e0e1 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Tue, 24 Aug 2004 00:58:28 +0000 Subject: init var. avoid valgrind warning svn-id: r14722 --- scumm/sound.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'scumm/sound.cpp') 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; -- cgit v1.2.3