[Scummvm-git-logs] scummvm master -> 83b86d4d1647d3383bbb8e8e2f0e80adb308aeb0

[fracturehill]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
69b70fd011 DEVTOOLS: Add missing strings in nancy.dat
83b86d4d16 NANCY: Properly reset TowerPuzzle after finishing


Commit: 69b70fd0111c21463ec1936c04dabfcd98ac3578
    https://github.com/scummvm/scummvm/commit/69b70fd0111c21463ec1936c04dabfcd98ac3578
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-07-19T17:08:15+03:00

Commit Message:
DEVTOOLS: Add missing strings in nancy.dat

Changed paths:
    devtools/create_nancy/nancy2_data.h


diff --git a/devtools/create_nancy/nancy2_data.h b/devtools/create_nancy/nancy2_data.h
index 5bb55715c40..b4bf191c216 100644
--- a/devtools/create_nancy/nancy2_data.h
+++ b/devtools/create_nancy/nancy2_data.h
@@ -406,8 +406,10 @@ const Common::Array<Common::Array<const char *>> _nancy2GoodbyeTexts = {
     "Listen, I gotta' go, Rick. Be careful, Okay?<h>", // NRD35
     "I should get back to the set. Goodbye!<h>", //  NPR16
     "Well, I'll let you get back to your business.<h>", // NLR18
+    "I should get back to the set. Goodbye!<h>", //  NPR16
     "I'll talk to you later. Bye!<h>", // NBES86
     "Talk to you later.<h>", // NGEO90
+	"", // No goodbye, empty string
     "Well, I'll see you later, Mattie.<h>", // NMD32
 },
 {   // Russian
@@ -415,8 +417,10 @@ const Common::Array<Common::Array<const char *>> _nancy2GoodbyeTexts = {
 	"Rik, mne nugno idti. Bud%te ostorogn=.<h>",
 	"Mne pora. Poka!<h>",
 	"Ne budu vas zadergivat%.<h>",
+	"Mne pora. Poka!<h>",
 	"Pohovorim pozge. Poka!<h>",
 	"Y pozvony pozge.<h>",
+	"", // No goodbye, empty string
 	"Do vstreqi, M&tti.<h>"
 }
 };


Commit: 83b86d4d1647d3383bbb8e8e2f0e80adb308aeb0
    https://github.com/scummvm/scummvm/commit/83b86d4d1647d3383bbb8e8e2f0e80adb308aeb0
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-07-19T17:08:15+03:00

Commit Message:
NANCY: Properly reset TowerPuzzle after finishing

Changed paths:
    engines/nancy/action/towerpuzzle.cpp


diff --git a/engines/nancy/action/towerpuzzle.cpp b/engines/nancy/action/towerpuzzle.cpp
index 2c7c612d6e4..b48099847c0 100644
--- a/engines/nancy/action/towerpuzzle.cpp
+++ b/engines/nancy/action/towerpuzzle.cpp
@@ -102,6 +102,8 @@ void TowerPuzzle::execute() {
 		_numRings = _numRingsByDifficulty[NancySceneState.getDifficulty()];
 
 		if (!_puzzleState->playerHasTriedPuzzle) {
+			_puzzleState->order.clear();
+			_puzzleState->order.resize(3, Common::Array<int8>(6, -1));
 			for (uint i = 0; i < _numRings; ++i) {
 				_puzzleState->order[0][i] = i;
 			}
@@ -155,6 +157,8 @@ void TowerPuzzle::execute() {
 		case kWaitForSound:
 			_solveExitScene.execute();
 			_puzzleState->playerHasTriedPuzzle = false;
+			_puzzleState->order.clear();
+			_puzzleState->order.resize(3, Common::Array<int8>(6, -1));
 			break;
 		}