[Scummvm-cvs-logs] scummvm master -> 89f233f4881589b925e871becbf3ec1b08db108e

[RichieSams]

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

Summary:
28e27ea1d9 ZVISION: Allow multiple sound effects to play at the same time
4f28cec6ac ZVISION: Keep the hand cursor during lever movement
89f233f488 ZVISION: Set the state value for the lever position during user dragging


Commit: 28e27ea1d94f1df4c8e68216c086cb57c396ccd8
    https://github.com/scummvm/scummvm/commit/28e27ea1d94f1df4c8e68216c086cb57c396ccd8
Author: RichieSams (adastley at gmail.com)
Date: 2015-01-15T00:31:39-06:00

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

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



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


Commit: 4f28cec6ac7ef68df373f6c1139a852150789851
    https://github.com/scummvm/scummvm/commit/4f28cec6ac7ef68df373f6c1139a852150789851
Author: RichieSams (adastley at gmail.com)
Date: 2015-01-15T00:40:37-06:00

Commit Message:
ZVISION: Keep the hand cursor during lever movement

We have to explicitly set the cursor each call otherwise the cursor will
be reset to the idle cursor. Addresses part of bug #6761

Changed paths:
    engines/zvision/scripting/controls/lever_control.cpp



diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index bef51f0..249c4c6 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -236,6 +236,8 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 				}
 			}
 		}
+		_engine->getCursorManager()->changeCursor(_cursor);
+		cursorWasChanged = true;
 	} else if (_frameInfo[_currentFrame].hotspot.contains(backgroundImageSpacePos)) {
 		_engine->getCursorManager()->changeCursor(_cursor);
 		cursorWasChanged = true;


Commit: 89f233f4881589b925e871becbf3ec1b08db108e
    https://github.com/scummvm/scummvm/commit/89f233f4881589b925e871becbf3ec1b08db108e
Author: RichieSams (adastley at gmail.com)
Date: 2015-01-15T00:41:13-06:00

Commit Message:
ZVISION: Set the state value for the lever position during user dragging

Not just during the "returning" animation. Addresses part of bug #6761

Changed paths:
    engines/zvision/scripting/controls/lever_control.cpp



diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 249c4c6..0f105b4 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -232,6 +232,7 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 				if (angle >= (int)iter->angle - ANGLE_DELTA && angle <= (int)iter->angle + ANGLE_DELTA) {
 					_currentFrame = iter->toFrame;
 					renderFrame(_currentFrame);
+					_engine->getScriptManager()->setStateValue(_key, _currentFrame);
 					break;
 				}
 			}