thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MOHAWK: Always restart a sound when replacing it with the same one

Browse source 
Fixes #9569
This commit is contained in:
Bastien Bouclet 2016-09-25 10:02:00 +02:00
parent 9a2fdf96ad
commit 97f5b33fd7
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/mohawk/sound.cpp
View file

@ -276,17 +276,6 @@ Audio::SoundHandle *Sound::playSound(uint16 id, byte volume, bool loop, CueList
Audio::SoundHandle *Sound::replaceSoundMyst(uint16 id, byte volume, bool loop) { Audio::SoundHandle *Sound::replaceSoundMyst(uint16 id, byte volume, bool loop) {
debug (0, "Replacing sound %d", id); debug (0, "Replacing sound %d", id);
// TODO: The original engine does fading
Common::String name = _vm->getResourceName(ID_MSND, convertMystID(id));
// Check if sound is already playing
for (uint32 i = 0; i < _handles.size(); i++)
if (_handles[i].type == kUsedHandle
&& _vm->_mixer->isSoundHandleActive(_handles[i].handle)
&& name.equals(_vm->getResourceName(ID_MSND, convertMystID(_handles[i].id))))
return &_handles[i].handle;
// The original engine also forces looping for those sounds // The original engine also forces looping for those sounds
switch (id) { switch (id) {
case 2205: case 2205: