[Scummvm-cvs-logs] scummvm master -> 9f00880aa40abb7584a007e10591ee5aa593ae7a

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9f00880aa4 ZVISION: Properly handle sounds reusing the same sound slot (bug #6761)


Commit: 9f00880aa40abb7584a007e10591ee5aa593ae7a
    https://github.com/scummvm/scummvm/commit/9f00880aa40abb7584a007e10591ee5aa593ae7a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-01-16T14:08:15+02:00

Commit Message:
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

Changed paths:
    engines/zvision/scripting/actions.cpp



diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp
index 3aab6d8..ce6bd31 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 {