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

[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:
f4ed71e893 WINTERMUTE: Restore some movie playback code


Commit: f4ed71e893d2e7b5f365cc4e4c4a79cd4d3a613c
    https://github.com/scummvm/scummvm/commit/f4ed71e893d2e7b5f365cc4e4c4a79cd4d3a613c
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-04T18:30:04+02:00

Commit Message:
WINTERMUTE: Restore some movie playback code

Changed paths:
    engines/wintermute/base/base_game.cpp


diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 0f30139644e..07c87b01b08 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -5347,9 +5347,8 @@ bool BaseGame::isVideoPlaying() {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseGame::stopVideo() {
-	if (_videoPlayer->isPlaying()) {
+	if (_videoPlayer->isPlaying())
 		_videoPlayer->stop();
-	}
 	if (_theoraPlayer && _theoraPlayer->isPlaying()) {
 		_theoraPlayer->stop();
 		SAFE_DELETE(_theoraPlayer);
@@ -5401,6 +5400,11 @@ bool BaseGame::onActivate(bool activate, bool refreshMouse) {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseGame::onMouseLeftDown() {
+	if (isVideoPlaying()) {
+		stopVideo ();
+		return STATUS_OK;
+	}
+
 	if (_activeObject) {
 		_activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_LEFT);
 	}
@@ -5423,6 +5427,9 @@ bool BaseGame::onMouseLeftDown() {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseGame::onMouseLeftUp() {
+	if (isVideoPlaying())
+		return STATUS_OK;
+
 	if (_activeObject) {
 		_activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT);
 	}
@@ -5442,6 +5449,9 @@ bool BaseGame::onMouseLeftUp() {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseGame::onMouseLeftDblClick() {
+	if (isVideoPlaying())
+		return STATUS_OK;
+
 	if (_state == GAME_RUNNING && !_interactive) {
 		return STATUS_OK;
 	}
@@ -5461,6 +5471,9 @@ bool BaseGame::onMouseLeftDblClick() {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseGame::onMouseRightDblClick() {
+	if (isVideoPlaying())
+		return STATUS_OK;
+
 	if (_state == GAME_RUNNING && !_interactive) {
 		return STATUS_OK;
 	}
@@ -5480,6 +5493,9 @@ bool BaseGame::onMouseRightDblClick() {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseGame::onMouseRightDown() {
+	if (isVideoPlaying())
+		return STATUS_OK;
+
 	if (_activeObject) {
 		_activeObject->handleMouse(MOUSE_CLICK, MOUSE_BUTTON_RIGHT);
 	}
@@ -5495,6 +5511,9 @@ bool BaseGame::onMouseRightDown() {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseGame::onMouseRightUp() {
+	if (isVideoPlaying())
+		return STATUS_OK;
+
 	if (_activeObject) {
 		_activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_RIGHT);
 	}
@@ -5510,6 +5529,9 @@ bool BaseGame::onMouseRightUp() {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseGame::onMouseMiddleDown() {
+	if (isVideoPlaying())
+		return STATUS_OK;
+
 	if (_state == GAME_RUNNING && !_interactive) {
 		return STATUS_OK;
 	}
@@ -5529,6 +5551,9 @@ bool BaseGame::onMouseMiddleDown() {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseGame::onMouseMiddleUp() {
+	if (isVideoPlaying())
+		return STATUS_OK;
+
 	if (_activeObject) {
 		_activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_MIDDLE);
 	}