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

[aquadran]

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:
c6ffe860f2 WINTREMUTE: Restore some video playback related code


Commit: c6ffe860f298c64e8890cfd033b8ea6b9d2a0298
    https://github.com/scummvm/scummvm/commit/c6ffe860f298c64e8890cfd033b8ea6b9d2a0298
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-03T12:33:29+02:00

Commit Message:
WINTREMUTE: Restore some video playback related code

Changed paths:
    engines/wintermute/ad/ad_game.cpp


diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index dae668a13d9..1a830023c3e 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -2400,6 +2400,11 @@ bool AdGame::onMouseLeftDown() {
 		return STATUS_OK;
 	}
 
+	if ((_videoSkipButton == VIDEO_SKIP_LEFT || _videoSkipButton == VIDEO_SKIP_BOTH) && isVideoPlaying()) {
+		_gameRef->stopVideo();
+		return STATUS_OK;
+	}
+
 	if (_activeObject) {
 		_activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_LEFT);
 	}
@@ -2423,6 +2428,9 @@ bool AdGame::onMouseLeftDown() {
 
 //////////////////////////////////////////////////////////////////////////
 bool AdGame::onMouseLeftUp() {
+	if (isVideoPlaying())
+		return STATUS_OK;
+
 	if (_activeObject) {
 		_activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT);
 	}
@@ -2453,6 +2461,10 @@ bool AdGame::onMouseLeftDblClick() {
 		return STATUS_OK;
 	}
 
+	if (isVideoPlaying()) {
+		return STATUS_OK;
+	}
+
 	if (_state == GAME_RUNNING && !_interactive) {
 		return STATUS_OK;
 	}
@@ -2484,6 +2496,11 @@ bool AdGame::onMouseRightDown() {
 		return STATUS_OK;
 	}
 
+	if ((_videoSkipButton == VIDEO_SKIP_RIGHT || _videoSkipButton == VIDEO_SKIP_BOTH) && isVideoPlaying()) {
+		_gameRef->stopVideo();
+		return STATUS_OK;
+	}
+
 	if ((_state == GAME_RUNNING && !_interactive) || _stateEx == GAME_WAITING_RESPONSE) {
 		return STATUS_OK;
 	}
@@ -2505,6 +2522,9 @@ bool AdGame::onMouseRightDown() {
 
 //////////////////////////////////////////////////////////////////////////
 bool AdGame::onMouseRightUp() {
+	if (isVideoPlaying())
+		return STATUS_OK;
+
 	if (_activeObject) {
 		_activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_RIGHT);
 	}