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

bluegr noreply at scummvm.org
Mon May 18 23:37:22 UTC 2026


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:
cb027fb7ff NANCY: Fix moving to the game over screen in whalesurvivorpuzzle


Commit: cb027fb7ff3ca6716bcd5abb5e9fdfc1bbdfa101
    https://github.com/scummvm/scummvm/commit/cb027fb7ff3ca6716bcd5abb5e9fdfc1bbdfa101
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-19T02:37:15+03:00

Commit Message:
NANCY: Fix moving to the game over screen in whalesurvivorpuzzle

Fix #16814

Changed paths:
    engines/nancy/action/puzzle/whalesurvivorpuzzle.cpp


diff --git a/engines/nancy/action/puzzle/whalesurvivorpuzzle.cpp b/engines/nancy/action/puzzle/whalesurvivorpuzzle.cpp
index 1c57b8fbd37..624d0b1d75b 100644
--- a/engines/nancy/action/puzzle/whalesurvivorpuzzle.cpp
+++ b/engines/nancy/action/puzzle/whalesurvivorpuzzle.cpp
@@ -422,11 +422,9 @@ void WhaleSurvivorPuzzle::execute() {
 			break;
 
 		case kHitAnimation:
-			// Waiting for player to click – handled in handleInput.
-			// If no lives remain, proceed directly to game over.
-			if (_lives <= 0) {
-				_gameState = kWinScreen;
-			}
+			// Show the "Oh no! Try again" overlay and wait for the player
+			// to click Start (full restart via kTryAgain) or Quit (loss
+			// scene). Both transitions are handled in handleInput().
 			redraw();
 			break;
 




More information about the Scummvm-git-logs mailing list