[Scummvm-git-logs] scummvm master -> 59e5654c2e8d6bb42fbcdbaa5c6f30bcde146dcd

[neuromancer]

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:
59e5654c2e PRIVATE: Enable pausing when police bust is enabled


Commit: 59e5654c2e8d6bb42fbcdbaa5c6f30bcde146dcd
    https://github.com/scummvm/scummvm/commit/59e5654c2e8d6bb42fbcdbaa5c6f30bcde146dcd
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-12-10T12:52:19+01:00

Commit Message:
PRIVATE: Enable pausing when police bust is enabled

Changed paths:
    engines/private/private.cpp


diff --git a/engines/private/private.cpp b/engines/private/private.cpp
index 722ba809be6..4de87538983 100644
--- a/engines/private/private.cpp
+++ b/engines/private/private.cpp
@@ -656,6 +656,10 @@ void PrivateEngine::completePoliceBust() {
 }
 
 void PrivateEngine::checkPoliceBust() {
+	if (_mode != 1) {
+		return;
+	}
+
 	if (!_policeBustEnabled) {
 		return;
 	}
@@ -794,7 +798,7 @@ bool PrivateEngine::cursorMask(Common::Point mousePos) {
 }
 
 bool PrivateEngine::cursorPauseMovie(Common::Point mousePos) {
-	if (_mode == 1 && !_policeBustEnabled) {
+	if (_mode == 1) {
 		uint32 tol = 15;
 		Common::Rect window(_origin.x - tol, _origin.y - tol, _screenW - _origin.x + tol, _screenH - _origin.y + tol);
 		if (!window.contains(mousePos)) {
@@ -891,7 +895,7 @@ const char *PrivateEngine::getSymbolName(const char *name, const char *strippedN
 }
 
 void PrivateEngine::selectPauseGame(Common::Point mousePos) {
-	if (_mode == 1 && !_policeBustEnabled) {
+	if (_mode == 1) {
 		uint32 tol = 15;
 		Common::Rect window(_origin.x - tol, _origin.y - tol, _screenW - _origin.x + tol, _screenH - _origin.y + tol);
 		if (!window.contains(mousePos)) {
@@ -960,7 +964,9 @@ bool PrivateEngine::selectExit(Common::Point mousePos) {
 		}
 	}
 	if (!ns.empty()) {
-		_numberOfClicks--; // count click only if it hits a hotspot
+		if (_mode == 1) {
+			_numberOfClicks--; // count click only if it hits a hotspot
+		}
 		_nextSetting = ns;
 		_highlightMasks = false;
 		return true;
@@ -997,7 +1003,9 @@ bool PrivateEngine::selectMask(Common::Point mousePos) {
 		}
 	}
 	if (!ns.empty()) {
-		_numberOfClicks--; // count click only if it hits a hotspot
+		if (_mode == 1) {
+			_numberOfClicks--; // count click only if it hits a hotspot
+		}
 		_nextSetting = ns;
 		_highlightMasks = false;
 		return true;