[Scummvm-git-logs] scummvm master -> 8912b88929133ce7c840d3b733471926172c67a1

elasota noreply at scummvm.org
Sat Dec 3 15:49:52 UTC 2022


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

Summary:
f1bac36e2b MTROPOLIS: Fix broken clickcount behavior.
8912b88929 MTROPOLIS: Fix backwards show/hide messages.  (Fixes incorrect Stevenson triggers in MTI)


Commit: f1bac36e2bd1e15944b5ed6edca8ed8e6aa5d84a
    https://github.com/scummvm/scummvm/commit/f1bac36e2bd1e15944b5ed6edca8ed8e6aa5d84a
Author: elasota (ejlasota at gmail.com)
Date: 2022-12-03T10:34:44-05:00

Commit Message:
MTROPOLIS: Fix broken clickcount behavior.

Changed paths:
    engines/mtropolis/runtime.cpp


diff --git a/engines/mtropolis/runtime.cpp b/engines/mtropolis/runtime.cpp
index bedaf67a804..66826ddfe36 100644
--- a/engines/mtropolis/runtime.cpp
+++ b/engines/mtropolis/runtime.cpp
@@ -4281,7 +4281,7 @@ bool Runtime::runFrame() {
 					MouseInputEvent *mouseEvt = static_cast<MouseInputEvent *>(evt.get());
 
 					if (evtType == kOSEventTypeMouseDown) {
-						if (_multiClickStartTime + _multiClickInterval >= _playTime) {
+						if (_multiClickStartTime + _multiClickInterval <= _playTime) {
 							_multiClickStartTime = _playTime;
 							_multiClickCount = 1;
 						} else


Commit: 8912b88929133ce7c840d3b733471926172c67a1
    https://github.com/scummvm/scummvm/commit/8912b88929133ce7c840d3b733471926172c67a1
Author: elasota (ejlasota at gmail.com)
Date: 2022-12-03T10:49:38-05:00

Commit Message:
MTROPOLIS: Fix backwards show/hide messages.  (Fixes incorrect Stevenson triggers in MTI)

Changed paths:
    engines/mtropolis/runtime.cpp


diff --git a/engines/mtropolis/runtime.cpp b/engines/mtropolis/runtime.cpp
index 66826ddfe36..fdeba34d32a 100644
--- a/engines/mtropolis/runtime.cpp
+++ b/engines/mtropolis/runtime.cpp
@@ -8411,7 +8411,7 @@ VThreadState VisualElement::changeVisibilityTask(const ChangeFlagTaskData &taskD
 	if (_visible != taskData.desiredFlag) {
 		setVisible(taskData.runtime, taskData.desiredFlag);
 
-		Common::SharedPtr<MessageProperties> msgProps(new MessageProperties(Event(_visible ? EventIDs::kElementHide : EventIDs::kElementShow, 0), DynamicValue(), getSelfReference()));
+		Common::SharedPtr<MessageProperties> msgProps(new MessageProperties(Event(taskData.desiredFlag ? EventIDs::kElementShow : EventIDs::kElementHide, 0), DynamicValue(), getSelfReference()));
 		Common::SharedPtr<MessageDispatch> dispatch(new MessageDispatch(msgProps, this, false, true, false));
 		taskData.runtime->sendMessageOnVThread(dispatch);
 	}




More information about the Scummvm-git-logs mailing list