[Scummvm-git-logs] scummvm master -> 2904a1071f7088a1fae51d6d26a78de0ba011014
bluegr
noreply at scummvm.org
Wed May 21 07:57:05 UTC 2025
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:
2904a1071f NANCY: Mention that the cursor is not changed over disabled buttons
Commit: 2904a1071f7088a1fae51d6d26a78de0ba011014
https://github.com/scummvm/scummvm/commit/2904a1071f7088a1fae51d6d26a78de0ba011014
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-05-21T10:56:36+03:00
Commit Message:
NANCY: Mention that the cursor is not changed over disabled buttons
Changed paths:
engines/nancy/action/puzzle/peepholepuzzle.cpp
diff --git a/engines/nancy/action/puzzle/peepholepuzzle.cpp b/engines/nancy/action/puzzle/peepholepuzzle.cpp
index 209e791561d..3ffe195143d 100644
--- a/engines/nancy/action/puzzle/peepholepuzzle.cpp
+++ b/engines/nancy/action/puzzle/peepholepuzzle.cpp
@@ -117,6 +117,7 @@ void PeepholePuzzle::handleInput(NancyInput &input) {
if (input.input & NancyInput::kLeftMouseButtonHeld) {
// Player is still holding the left button, check if mouse has moved outside bounds
if (NancySceneState.getViewport().convertViewportToScreen(_buttonDests[_pressedButton]).contains(input.mousePos)) {
+ // NOTE: Contrary to the original, we don't change the cursor to a hotspot over disabled buttons
if (!_disabledButtons[_pressedButton]) {
// Do not show hover cursor on disabled button
g_nancy->_cursor->setCursorType(CursorManager::kHotspot);
@@ -135,6 +136,7 @@ void PeepholePuzzle::handleInput(NancyInput &input) {
// Player released mouse button
// Avoid single frame with non-highlighted cursor
+ // NOTE: Contrary to the original, we don't change the cursor to a hotspot over disabled buttons
if (NancySceneState.getViewport().convertViewportToScreen(_buttonDests[_pressedButton]).contains(input.mousePos) && !_disabledButtons[_pressedButton]) {
g_nancy->_cursor->setCursorType(CursorManager::kHotspot);
}
@@ -146,6 +148,7 @@ void PeepholePuzzle::handleInput(NancyInput &input) {
} else {
// Mouse is not currently pressing button, check all buttons
for (uint i = 0; i < 4; ++i) {
+ // NOTE: Contrary to the original, we don't change the cursor to a hotspot over disabled buttons
if (!_disabledButtons[i]) {
if (NancySceneState.getViewport().convertViewportToScreen(_buttonDests[i]).contains(input.mousePos)) {
g_nancy->_cursor->setCursorType(CursorManager::kHotspot);
More information about the Scummvm-git-logs
mailing list