aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-08-24 00:58:28 +0000
committerTravis Howell2004-08-24 00:58:28 +0000
commitbdd0dfef430b11b35199a0bd472dfeefd608e0e1 (patch)
tree9eab4eedd14210a1855e93afd145bb2582b4bf6f
parent400582bd9d67588c951bd06ced6be18760a590b5 (diff)
downloadscummvm-rg350-bdd0dfef430b11b35199a0bd472dfeefd608e0e1.tar.gz
scummvm-rg350-bdd0dfef430b11b35199a0bd472dfeefd608e0e1.tar.bz2
scummvm-rg350-bdd0dfef430b11b35199a0bd472dfeefd608e0e1.zip
init var.
avoid valgrind warning svn-id: r14722
-rw-r--r--scumm/scumm.cpp1
-rw-r--r--scumm/sound.cpp11
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;