aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichieSams2015-01-15 00:31:39 -0600
committerRichieSams2015-01-15 00:31:39 -0600
commit28e27ea1d94f1df4c8e68216c086cb57c396ccd8 (patch)
treee96ea83296db3514d11718e99ac9d4f6c429c58a
parentcc045f7a83b1282ee453d0c1d90ca2372de554c8 (diff)
downloadscummvm-rg350-28e27ea1d94f1df4c8e68216c086cb57c396ccd8.tar.gz
scummvm-rg350-28e27ea1d94f1df4c8e68216c086cb57c396ccd8.tar.bz2
scummvm-rg350-28e27ea1d94f1df4c8e68216c086cb57c396ccd8.zip
ZVISION: Allow multiple sound effects to play at the same time
This is the original behavior. This was noted in bug #6761. Specifically, the knocker on the door plays a sound whenever it is a the top of the bottom of the swing. By only allowing one sound effect to play at the same time, the knocker would only play once, even though it bounces at the bottom.
-rw-r--r--engines/zvision/scripting/actions.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index e989478dd1..3aab6d8830 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -486,9 +486,6 @@ ActionMusic::~ActionMusic() {
}
bool ActionMusic::execute() {
- if (_engine->getScriptManager()->getSideFX(_slotKey))
- return true;
-
if (_midi) {
_engine->getScriptManager()->addSideFX(new MusicMidiNode(_engine, _slotKey, _prog, _note, _volume));
} else {