From 9f00880aa40abb7584a007e10591ee5aa593ae7a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 16 Jan 2015 14:08:15 +0200
Subject: ZVISION: Properly handle sounds reusing the same sound slot (bug
 #6761)

This is based on Marisa-Chan's observations in commit 28e27ea1d9.
Tested with both ZNEM and ZGI
---
 engines/zvision/scripting/actions.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'engines/zvision')

diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 3aab6d8830..ce6bd31ee4 100644
--- a/engines/zvision/scripting/actions.cpp
+++ b/engines/zvision/scripting/actions.cpp
@@ -486,6 +486,11 @@ ActionMusic::~ActionMusic() {
 }
 
 bool ActionMusic::execute() {
+	if (_engine->getScriptManager()->getSideFX(_slotKey)) {
+		_engine->getScriptManager()->killSideFx(_slotKey);
+		_engine->getScriptManager()->setStateValue(_slotKey, 2);
+	}
+
 	if (_midi) {
 		_engine->getScriptManager()->addSideFX(new MusicMidiNode(_engine, _slotKey, _prog, _note, _volume));
 	} else {
-- 
cgit v1.2.3