ZVISION: Implement enabled/disabled support in Controls

2 files changed, 24 insertions, 0 deletions

diff --git a/engines/zvision/lever_control.cpp b/engines/zvision/lever_control.cpp
index 45c21efd49..2a5fe4fcac 100644
--- a/engines/zvision/lever_control.cpp
+++ b/engines/zvision/lever_control.cpp
@@ -183,6 +183,10 @@ void LeverControl::parseLevFile(const Common::String &fileName) {
 }
 
 void LeverControl::onMouseDown(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (!_enabled) {
+		return;
+	}
+	
 	if (_frameInfo[_currentFrame].hotspot.contains(backgroundImageSpacePos)) {
 		_mouseIsCaptured = true;
 		_lastMousePos = backgroundImageSpacePos;
@@ -190,6 +194,10 @@ void LeverControl::onMouseDown(const Common::Point &screenSpacePos, const Common
 }
 
 void LeverControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (!_enabled) {
+		return;
+	}
+	
 	_mouseIsCaptured = false;
 	_engine->getScriptManager()->setStateValue(_key, _currentFrame);
 
@@ -201,6 +209,10 @@ void LeverControl::onMouseUp(const Common::Point &screenSpacePos, const Common::
 }
 
 bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (!_enabled) {
+		return false;
+	}
+	
 	bool cursorWasChanged = false;
 
 	if (_mouseIsCaptured) {
@@ -228,6 +240,10 @@ bool LeverControl::onMouseMove(const Common::Point &screenSpacePos, const Common
 }
 
 bool LeverControl::process(uint32 deltaTimeInMillis) {
+	if (!_enabled) {
+		return false;
+	}
+
 	// TODO: Implement reversal over time
 
 	return false;
diff --git a/engines/zvision/push_toggle_control.cpp b/engines/zvision/push_toggle_control.cpp
index be038e767a..f4c0bc987e 100644
--- a/engines/zvision/push_toggle_control.cpp
+++ b/engines/zvision/push_toggle_control.cpp
@@ -71,12 +71,20 @@ PushToggleControl::~PushToggleControl() {
 }
 
 void PushToggleControl::onMouseUp(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (!_enabled) {
+		return;
+	}
+	
 	if (_hotspot.contains(backgroundImageSpacePos)) {
 		_engine->getScriptManager()->setStateValue(_key, 1);
 	}
 }
 
 bool PushToggleControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	if (!_enabled) {
+		return false;
+	}
+	
 	if (_hotspot.contains(backgroundImageSpacePos)) {
 		_engine->getCursorManager()->changeCursor(_hoverCursor);
 		return true;