aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Bouclet2016-09-25 10:02:00 +0200
committerBastien Bouclet2016-09-25 10:02:00 +0200
commit97f5b33fd71425aa8cb7cebecbb68f59b0e7760d (patch)
treee92c736a4ea28a643f02fe687414af1c90d9610e
parent9a2fdf96ade19b6b06e5f198dc4d3175130906f1 (diff)
downloadscummvm-rg350-97f5b33fd71425aa8cb7cebecbb68f59b0e7760d.tar.gz
scummvm-rg350-97f5b33fd71425aa8cb7cebecbb68f59b0e7760d.tar.bz2
scummvm-rg350-97f5b33fd71425aa8cb7cebecbb68f59b0e7760d.zip
MOHAWK: Always restart a sound when replacing it with the same one
Fixes #9569
-rw-r--r--engines/mohawk/sound.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp
index 0711561068..2a54696b68 100644
--- a/engines/mohawk/sound.cpp
+++ b/engines/mohawk/sound.cpp
@@ -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) {
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
switch (id) {
case 2205: