[Scummvm-git-logs] scummvm master -> 99c58c1227425ddd84417496d41c5380163ce757

[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:
48184e7c88 NANCY: Fix incorrectly picked conversation responses
99c58c1227 DEVTOOLS: Fix incorrect scene names in nancy.dat


Commit: 48184e7c88f394327a020b3f7fb64a33269e9ebb
    https://github.com/scummvm/scummvm/commit/48184e7c88f394327a020b3f7fb64a33269e9ebb
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-07-19T21:47:24+03:00

Commit Message:
NANCY: Fix incorrectly picked conversation responses

Fixed an issue where the engine would pick a conversation
response different from the one the player clicked on.

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


diff --git a/engines/nancy/action/conversation.cpp b/engines/nancy/action/conversation.cpp
index e86a4f5da2e..9431dfd0868 100644
--- a/engines/nancy/action/conversation.cpp
+++ b/engines/nancy/action/conversation.cpp
@@ -223,7 +223,7 @@ void ConversationSound::execute() {
 				// NPC has finished talking, we have responses
 				for (uint i = 0; i < 30; ++i) {
 					if (NancySceneState.getLogicCondition(i, g_nancy->_true)) {
-						int pickedOnScreenResponse = _pickedResponse = i;
+						_pickedResponse = i;
 
 						// Adjust to account for hidden responses
 						for (uint j = 0; j < _responses.size(); ++j) {
@@ -231,7 +231,7 @@ void ConversationSound::execute() {
 								++_pickedResponse;
 							}
 
-							if ((int)j == pickedOnScreenResponse) {
+							if ((int)j == _pickedResponse) {
 								break;
 							}
 						}


Commit: 99c58c1227425ddd84417496d41c5380163ce757
    https://github.com/scummvm/scummvm/commit/99c58c1227425ddd84417496d41c5380163ce757
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-07-19T21:47:24+03:00

Commit Message:
DEVTOOLS: Fix incorrect scene names 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 b4bf191c216..f4ee8bcfbef 100644
--- a/devtools/create_nancy/nancy2_data.h
+++ b/devtools/create_nancy/nancy2_data.h
@@ -248,8 +248,8 @@ const Common::Array<Common::Array<ConditionalDialogue>> _nancy2ConditionalDialog
 const Common::Array<Goodbye> _nancy2Goodbyes = {
     { "NDA29", { { { 890, 891, 892, 893 }, {}, NOFLAG } } }, // Dwayne
     { "NRD35", { { { 791, 792, 793, 794 }, {}, NOFLAG } } }, // Rick
-    { "NPR16", { { { 391, 392, 393 }, {}, NOFLAG } } },      // Millie
-    { "NLR18", { { { 590, 591, 592 }, {}, NOFLAG } } },      // Lillian
+    { "NPR16", { { { 391, 392, 394 }, {}, NOFLAG } } },      // Millie
+    { "NLR18", { { { 590, 591, 593 }, {}, NOFLAG } } },      // Lillian
     { "NPR16", { { { 3090, 3092, 3093 }, {}, NOFLAG } } },   // Ned
     { "NBES86", { { { 3190 }, {}, NOFLAG } } },              // Bess
     { "NGEO90", { { { 3290 }, {}, NOFLAG } } },              // George