libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 14:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup; workaround for bug #1852635 (INDY3 Mac: Crash When Playing Sound 54)

Browse Source 
svn-id: r29975
This commit is contained in:
Max Horn 2007-12-24 14:40:39 +00:00
parent 138263ec03
commit d973d3736c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/scumm/sound.cpp
View File

@ -160,7 +160,6 @@ void Sound::processSoundQueues() {
}
void Sound::playSound(int soundID) {
byte *mallocedPtr = NULL;
byte *ptr;
char *sound;
int size = -1;
@ -352,7 +351,6 @@ void Sound::playSound(int soundID) {
ptr += 0x16;
if (soundID == _currentCDSound && pollCD() == 1) {
free(mallocedPtr);
return;
}
@ -397,9 +395,12 @@ void Sound::playSound(int soundID) {
}
else if ((_vm->_game.platform == Common::kPlatformMacintosh) && (_vm->_game.id == GID_INDY3) && (ptr[26] == 0)) {
size = READ_BE_UINT16(ptr + 12);
if (size == 0) // WORKAROUND bug #1852635: Sound 54 has size 0.
return;
rate = 3579545 / READ_BE_UINT16(ptr + 20);
sound = (char *)malloc(size);
int vol = ptr[24] * 4;
memcpy(sound, ptr + READ_BE_UINT16(ptr + 8), size);
_mixer->playRaw(Audio::Mixer::kSFXSoundType, NULL, sound, size, rate, Audio::Mixer::FLAG_AUTOFREE, soundID, vol, 0);
}
@ -441,8 +442,6 @@ void Sound::playSound(int soundID) {
_vm->_musicEngine->startSound(soundID);
}
}
free(mallocedPtr);
}
void Sound::processSfxQueues() {