libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 16:03:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

init var.

Browse Source 
avoid valgrind warning

svn-id: r14722
This commit is contained in:
Travis Howell 2004-08-24 00:58:28 +00:00
parent 400582bd9d
commit bdd0dfef43
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scumm/scumm.cpp
View File

@ -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;

11
scumm/sound.cpp
View File

@ -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;