[Scummvm-git-logs] scummvm master -> 7715eb98cb7fe26fd6a0ad1f3363cfd36ddd5857

[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:
58a34027b2 DEVTOOLS: Fix incorrectly patched scene in nancy.dat
7715eb98cb NANCY: Disable SoundDescriptions by default


Commit: 58a34027b2f56b113ff6504c6fc11dd643338d3d
    https://github.com/scummvm/scummvm/commit/58a34027b2f56b113ff6504c6fc11dd643338d3d
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-11-13T21:18:35+02:00

Commit Message:
DEVTOOLS: Fix incorrectly patched scene in nancy.dat

Fixed an error in the nancy5 data which would cause the
softlock fix to always be enabled, and the Simone purse
fix to be toggleable, instead of the other way around.

Changed paths:
    devtools/create_nancy/nancy5_data.h


diff --git a/devtools/create_nancy/nancy5_data.h b/devtools/create_nancy/nancy5_data.h
index 6411bcdd48a..b875b670f4e 100644
--- a/devtools/create_nancy/nancy5_data.h
+++ b/devtools/create_nancy/nancy5_data.h
@@ -833,7 +833,7 @@ const Common::Array<const char *> _nancy5EventFlagNames = {
 //   it seems to be what the original devs were planning to do; there is a check for the flash paper in
 //   the exact scene that we patch. However, failing that check simply locks you in the room forever,
 //   because they seem to have forgotten to finish the softlock fix.
-// - S3503 removes the check for close captioning which would result in the player being unable to
+// - S3218 removes the check for close captioning which would result in the player being unable to
 //   close Simone's purse without having subtitles on. Technically not a softlock but just a plain bug,
 //   so it is not hidden behind a setting, and is always enabled.
 
@@ -843,7 +843,7 @@ const Common::Array<const char *> nancy5PatchSrcFiles {
 };
 
 const Common::Array<PatchAssociation> nancy5PatchAssociations {
-	{ { "softlocks_fix", "true" }, { "S3218" } }
+	{ { "softlocks_fix", "true" }, { "S3503" } }
 };
 
 #endif // NANCY5DATA_H


Commit: 7715eb98cb7fe26fd6a0ad1f3363cfd36ddd5857
    https://github.com/scummvm/scummvm/commit/7715eb98cb7fe26fd6a0ad1f3363cfd36ddd5857
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-11-13T21:18:35+02:00

Commit Message:
NANCY: Disable SoundDescriptions by default

Added a default name of NO SOUND for all sound
descriptions, which fixes at least one instance where an
uninitialized description would cause sound to stop playing
in nancy5

Changed paths:
    engines/nancy/commontypes.h


diff --git a/engines/nancy/commontypes.h b/engines/nancy/commontypes.h
index 0e0aa90ebf5..5b25fe08ab0 100644
--- a/engines/nancy/commontypes.h
+++ b/engines/nancy/commontypes.h
@@ -245,7 +245,7 @@ struct SoundEffectDescription {
 
 // Descrbes a single sound. Combines four different structs found in the data in one
 struct SoundDescription {
-	Common::String name;
+	Common::String name = "NO SOUND";
 	uint16 channelID = 0;
 	uint16 playCommands = 1;
 	uint16 numLoops = 0;