[Scummvm-git-logs] scummvm master -> 293714b070bbe3e7af605722fa1ff9ef1cf5f18d

[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:
cdb3c7924b NANCY: Play RaycastPuzzle switch sound when unpressing
293714b070 NANCY: Add detection for nancy7 through 9


Commit: cdb3c7924b4b57ceb01fa5d0ce25e1280891365b
    https://github.com/scummvm/scummvm/commit/cdb3c7924b4b57ceb01fa5d0ce25e1280891365b
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-09-16T23:46:42+03:00

Commit Message:
NANCY: Play RaycastPuzzle switch sound when unpressing

Fixed an oversight that would result in the switch click
sound in RaycastPuzzle only playing half the time.

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


diff --git a/engines/nancy/action/puzzle/raycastpuzzle.cpp b/engines/nancy/action/puzzle/raycastpuzzle.cpp
index 769cfb498cc..16f4717a170 100644
--- a/engines/nancy/action/puzzle/raycastpuzzle.cpp
+++ b/engines/nancy/action/puzzle/raycastpuzzle.cpp
@@ -2041,6 +2041,9 @@ void RaycastPuzzle::checkSwitch() {
 					}
 
 					_lightSwitchStates[i] = false;
+					_dummySound.name = _switchSoundName;
+					_dummySound.channelID = _switchSoundChannelID;
+					g_nancy->_sound->playSound(_dummySound);
 				}
 			}
 		} else {


Commit: 293714b070bbe3e7af605722fa1ff9ef1cf5f18d
    https://github.com/scummvm/scummvm/commit/293714b070bbe3e7af605722fa1ff9ef1cf5f18d
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-09-16T23:46:42+03:00

Commit Message:
NANCY: Add detection for nancy7 through 9

Added detection entries for all Nancy Drew games before
the first major UI refresh. Also re-added an erroneously
removed list end marker without which detection would break for all engines.

Changed paths:
    engines/nancy/detection.cpp
    engines/nancy/detection.h


diff --git a/engines/nancy/detection.cpp b/engines/nancy/detection.cpp
index 0f710f6ec00..dafb308b178 100644
--- a/engines/nancy/detection.cpp
+++ b/engines/nancy/detection.cpp
@@ -27,6 +27,7 @@ const char *const directoryGlobs[] = {
 	"game",
 	"iff",
 	"cifTree",
+	"datafiles",
 	nullptr
 };
 
@@ -47,6 +48,9 @@ static const PlainGameDescriptor nancyGames[] = {
 	{ "nancy4", "Nancy Drew: Treasure in the Royal Tower" },
 	{ "nancy5", "Nancy Drew: The Final Scene" },
 	{ "nancy6", "Nancy Drew: Secret of the Scarlet Hand" },
+	{ "nancy7", "Nancy Drew: Ghost Dogs of Moon Lake" },
+	{ "nancy8", "Nancy Drew: The Haunted Carousel" },
+	{ "nancy9", "Nancy Drew: Danger on Deception Island" },
 	{ nullptr, nullptr }
 };
 
@@ -107,7 +111,7 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
 			AD_ENTRY1s("ciftree.dat", "fa4293d728a1b31407961cd82e86a015", 7784516),
 			Common::EN_ANY,
 			Common::kPlatformWindows,
-			ADGF_UNSTABLE,
+			ADGF_UNSTABLE | ADGF_DROPPLATFORM,
 			GUIO0()
 		},
 		Nancy::kGameTypeNancy2
@@ -371,7 +375,43 @@ static const Nancy::NancyGameDescription gameDescriptions[] = {
 			GUIO0()
 		},
 		Nancy::kGameTypeNancy6
-	}
+	},
+	{
+		{
+			"nancy7", nullptr,
+			AD_ENTRY1s("ciftree.dat", "e49e6f56a47c363e2651bd19a70ff557", 55835579),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE | ADGF_DROPPLATFORM,
+			GUIO0()
+		},
+		Nancy::kGameTypeNancy7
+	},
+	{
+		{
+			"nancy8", nullptr,
+			AD_ENTRY1s("ciftree.dat", "d85192a942a207017ebf0a19207ac698", 19498032),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE | ADGF_DROPPLATFORM,
+			GUIO0()
+		},
+		Nancy::kGameTypeNancy8
+	},
+	{
+		{
+			"nancy9", nullptr,
+			AD_ENTRY1s("ciftree.dat", "3a756e09631f4a2c8f48bf316e77b5d5", 26610718),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_UNSTABLE | ADGF_DROPPLATFORM,
+			GUIO0()
+		},
+		Nancy::kGameTypeNancy9
+	},
+
+	// Do not delete
+	{ AD_TABLE_END_MARKER, Nancy::kGameTypeNone }
 };
 
 class NancyMetaEngineDetection : public AdvancedMetaEngineDetection {
diff --git a/engines/nancy/detection.h b/engines/nancy/detection.h
index dfc3427319a..8e7e05e8027 100644
--- a/engines/nancy/detection.h
+++ b/engines/nancy/detection.h
@@ -34,7 +34,10 @@ enum GameType {
 	kGameTypeNancy3 = 4,
 	kGameTypeNancy4 = 5,
 	kGameTypeNancy5 = 6,
-	kGameTypeNancy6 = 7
+	kGameTypeNancy6 = 7,
+	kGameTypeNancy7 = 8,
+	kGameTypeNancy8 = 9,
+	kGameTypeNancy9 = 10
 };
 
 enum NancyGameFlags {