[Scummvm-git-logs] scummvm master -> 30c9816a7a53e35e25686fdae8068eacbccafc37

[fracturehill]

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:
30c9816a7a NANCY: Fix for getting stuck in Telephone scene


Commit: 30c9816a7a53e35e25686fdae8068eacbccafc37
    https://github.com/scummvm/scummvm/commit/30c9816a7a53e35e25686fdae8068eacbccafc37
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-11-23T14:21:44+02:00

Commit Message:
NANCY: Fix for getting stuck in Telephone scene

Nancy3 has a bugged Telephone instance that can get the
player stuck forever in the same scene (this happens in the
original game). This commit makes sure to avoid such cases.
Also, players can now exit a Telephone scene while ringing.

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


diff --git a/engines/nancy/action/puzzle/telephone.cpp b/engines/nancy/action/puzzle/telephone.cpp
index f1b0c20f093..30526200063 100644
--- a/engines/nancy/action/puzzle/telephone.cpp
+++ b/engines/nancy/action/puzzle/telephone.cpp
@@ -241,6 +241,11 @@ void Telephone::execute() {
 			break;
 		case kCall: {
 			PhoneCall &call = _calls[_selected];
+			if (call.sceneChange._sceneChange.sceneID == kNoScene) {
+				// Make sure we don't get stuck here. Happens in nancy3 when calling George's number
+				call.sceneChange._sceneChange = NancySceneState.getSceneInfo();
+			}
+
 			call.sceneChange.execute();
 
 			break;
@@ -275,7 +280,7 @@ void Telephone::handleInput(NancyInput &input) {
 		}
 	}
 
-	if (_callState != kWaiting) {
+	if (_callState != kWaiting && _callState != kRinging) {
 		return;
 	}
 
@@ -292,6 +297,10 @@ void Telephone::handleInput(NancyInput &input) {
 		return;
 	}
 
+	if (_callState != kWaiting) {
+		return;
+	}
+
 	if (buttonNr != -1) {
 		if (input.input & NancyInput::kLeftMouseButtonUp) {
 			if (g_nancy->_sound->isSoundPlaying(_dialToneSound)) {