[Scummvm-git-logs] scummvm master -> 223c3989903239c59dca024f392af9644551e682
neuromancer
neuromancer at users.noreply.github.com
Tue Jul 6 18:19:52 UTC 2021
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
223c398990 PRIVATE: disable pause menu when police bust is enabled
Commit: 223c3989903239c59dca024f392af9644551e682
https://github.com/scummvm/scummvm/commit/223c3989903239c59dca024f392af9644551e682
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2021-07-06T20:19:18+02:00
Commit Message:
PRIVATE: disable pause menu when police bust is enabled
Changed paths:
engines/private/private.cpp
diff --git a/engines/private/private.cpp b/engines/private/private.cpp
index 5cd7a3562e..7688027461 100644
--- a/engines/private/private.cpp
+++ b/engines/private/private.cpp
@@ -509,7 +509,7 @@ bool PrivateEngine::cursorMask(Common::Point mousePos) {
}
bool PrivateEngine::cursorPauseMovie(Common::Point mousePos) {
- if (_mode == 1) {
+ if (_mode == 1 && !_policeBustEnabled) {
uint32 tol = 15;
Common::Rect window(_origin.x - tol, _origin.y - tol, _screenW - _origin.x + tol, _screenH - _origin.y + tol);
if (!window.contains(mousePos)) {
@@ -593,7 +593,7 @@ Common::String PrivateEngine::getInventoryCursor() {
}
void PrivateEngine::selectPauseMovie(Common::Point mousePos) {
- if (_mode == 1) {
+ if (_mode == 1 && !_policeBustEnabled) {
uint32 tol = 15;
Common::Rect window(_origin.x - tol, _origin.y - tol, _screenW - _origin.x + tol, _screenH - _origin.y + tol);
if (!window.contains(mousePos)) {
More information about the Scummvm-git-logs
mailing list