[Scummvm-git-logs] scummvm master -> a43c110c74385dbae9916c10ef34b9bb533f07e2

[sluicebox]

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

Summary:
a43c110c74 PRIVATE: Skip memory video when clicking border


Commit: a43c110c74385dbae9916c10ef34b9bb533f07e2
    https://github.com/scummvm/scummvm/commit/a43c110c74385dbae9916c10ef34b9bb533f07e2
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-12-15T09:39:41-08:00

Commit Message:
PRIVATE: Skip memory video when clicking border

Changed paths:
    engines/private/private.cpp
    engines/private/private.h


diff --git a/engines/private/private.cpp b/engines/private/private.cpp
index a33c9a57c47..37da05d4c04 100644
--- a/engines/private/private.cpp
+++ b/engines/private/private.cpp
@@ -409,6 +409,8 @@ Common::Error PrivateEngine::run() {
 					_needToDrawScreenFrame = true;
 					break;
 				}
+				if (selectSkipMemoryVideo(mousePos))
+					break;
 
 				if (selectPhoneArea(mousePos))
 					 break;
@@ -3042,4 +3044,19 @@ int PrivateEngine::getMaxLocationValue() {
 	return maxValue;
 }
 
+bool PrivateEngine::selectSkipMemoryVideo(Common::Point mousePos) {
+	// if a video is playing in mode 0 then it is a memory video.
+	// (this is mode 2 in the original, but we don't use kGoThumbnailMovie)
+	if (_mode == 0 && _videoDecoder != nullptr) {
+		const uint32 tol = 15;
+		const Common::Point origin(kOriginOne[0], kOriginOne[1]);
+		const Common::Rect window(origin.x - tol, origin.y - tol, _screenW - origin.x + tol, _screenH - origin.y + tol);
+		if (!window.contains(mousePos)) {
+			skipVideo();
+			return true;
+		}
+	}
+	return false;
+}
+
 } // End of namespace Private
diff --git a/engines/private/private.h b/engines/private/private.h
index e1ee30be906..24539fd2633 100644
--- a/engines/private/private.h
+++ b/engines/private/private.h
@@ -422,6 +422,7 @@ public:
 	bool selectMemory(const Common::Point &mousePos);
 	void setLocationAsVisited(Symbol *location);
 	int getMaxLocationValue();
+	bool selectSkipMemoryVideo(Common::Point mousePos);
 
 	// Save/Load games
 	MaskInfo _saveGameMask;