[Scummvm-git-logs] scummvm master -> 23c1e1406971043e1640ce3ae2fcf17d1948663a

[bluegr]

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

Summary:
bc9f8a0679 NANCY: Fix check for minor version of nancy.dat
939966aa77 DEVTOOLS: Fix dialog event entries in nancy7 conditional dialog data
23c1e14069 DISTS: Update nancy.dat


Commit: bc9f8a06791d201314e1c06b0f445d493985e893
    https://github.com/scummvm/scummvm/commit/bc9f8a06791d201314e1c06b0f445d493985e893
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-18T22:28:27+02:00

Commit Message:
NANCY: Fix check for minor version of nancy.dat

This makes sure that the added field will be properly read when the
minor version of nancy.dat is updated

Changed paths:
    engines/nancy/commontypes.cpp


diff --git a/engines/nancy/commontypes.cpp b/engines/nancy/commontypes.cpp
index 8aaa38983d3..2a2fd87e8eb 100644
--- a/engines/nancy/commontypes.cpp
+++ b/engines/nancy/commontypes.cpp
@@ -391,7 +391,7 @@ void StaticData::readData(Common::SeekableReadStream &stream, Common::Language l
 			}
 
 			logoEndAfter = stream.readUint32LE();
-			if (minorVersion == 1) {
+			if (minorVersion >= 1) {
 				wonGameFlagID = stream.readUint16LE();
 			}
 


Commit: 939966aa778230ae358dd202009cead800573c84
    https://github.com/scummvm/scummvm/commit/939966aa778230ae358dd202009cead800573c84
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-18T22:28:28+02:00

Commit Message:
DEVTOOLS: Fix dialog event entries in nancy7 conditional dialog data

Fixes a crash in Nancy 7 - Ghost Dogs of Moon Lake, when talking to the
Hardy Boys. Properly fixes the issue reported in PR #6485

Changed paths:
    devtools/create_nancy/nancy7_data.h


diff --git a/devtools/create_nancy/nancy7_data.h b/devtools/create_nancy/nancy7_data.h
index 04e9a31e481..cfeb6761920 100644
--- a/devtools/create_nancy/nancy7_data.h
+++ b/devtools/create_nancy/nancy7_data.h
@@ -216,9 +216,9 @@ const Common::Array<Common::Array<ConditionalDialogue>> _nancy7ConditionalDialog
 	{	0, 1855, "NFJ55",
 		{ { kEv, 148, true }, { kEv, 155, true }, { kEv, 315, true }, { kEv, 297, true }, { kEv, 298, true }, { kEv, 296, true }, { kEv, 294, true }, { kEv, 156, false } } },
 	{	0, 1870, "NFJ70",
-		{ { kEv, 220, true }, { kEv, 217, true }, { kEv, 158, true }, { kIn, 147, false } } },
+		{ { kEv, 220, true }, { kEv, 217, true }, { kEv, 158, true }, { kEv, 147, false } } },
 	{	0, 1871, "NFJ70",
-		{ { kEv, 220, true }, { kEv, 217, true }, { kEv, 158, true }, { kIn, 147, true } } }
+		{ { kEv, 220, true }, { kEv, 217, true }, { kEv, 158, true }, { kEv, 147, true } } }
 },
 {	// Vivian, 14 responses
 	{	0, 1950, "NVW50",


Commit: 23c1e1406971043e1640ce3ae2fcf17d1948663a
    https://github.com/scummvm/scummvm/commit/23c1e1406971043e1640ce3ae2fcf17d1948663a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-03-18T22:28:29+02:00

Commit Message:
DISTS: Update nancy.dat

Fixes a crash in Nancy 7 - Ghost Dogs of Moon Lake, when talking to the
Hardy Boys. Properly fixes the issue reported in PR #6485

Changed paths:
    dists/engine-data/nancy.dat


diff --git a/dists/engine-data/nancy.dat b/dists/engine-data/nancy.dat
index a151d65ff77..d196a040eed 100644
Binary files a/dists/engine-data/nancy.dat and b/dists/engine-data/nancy.dat differ