[Scummvm-git-logs] scummvm master -> 395073eb603ff9f734c7b0bf127f2555f5ae6247

[whoozle]

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

Summary:
395073eb60 AGDS: add data.adb to detection tables


Commit: 395073eb603ff9f734c7b0bf127f2555f5ae6247
    https://github.com/scummvm/scummvm/commit/395073eb603ff9f734c7b0bf127f2555f5ae6247
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2025-11-28T13:04:02Z

Commit Message:
AGDS: add data.adb to detection tables

- add unsupported CD version to the detection tables
- make patch.adb optional
- reduce scan depth
- remove noisy "scaled" log

data.adb seems to be encrypted with proper encryption, so it's not really possible to use it.

Changed paths:
    engines/agds/agds.cpp
    engines/agds/detection.cpp
    engines/agds/detection_tables.h
    engines/agds/mjpgPlayer.cpp


diff --git a/engines/agds/agds.cpp b/engines/agds/agds.cpp
index e4aa44340f5..04121063d2f 100644
--- a/engines/agds/agds.cpp
+++ b/engines/agds/agds.cpp
@@ -43,8 +43,8 @@
 #include "common/savefile.h"
 #include "common/system.h"
 #include "engines/util.h"
-#include "graphics/managed_surface.h"
 #include "graphics/fonts/ttf.h"
+#include "graphics/managed_surface.h"
 
 namespace AGDS {
 
@@ -157,11 +157,12 @@ bool AGDSEngine::load() {
 
 	{
 		Common::File file;
-		file.open("patch.adb");
-		Database patch;
-		patch.open("patch.adb");
+		if (file.open("patch.adb")) {
+			Database patch;
+			patch.open("patch.adb");
 
-		loadPatches(file, patch);
+			loadPatches(file, patch);
+		}
 	}
 	{
 		Common::ScopedPtr<Common::File> file(new Common::File());
diff --git a/engines/agds/detection.cpp b/engines/agds/detection.cpp
index db0dd98bf48..ecbb4774887 100644
--- a/engines/agds/detection.cpp
+++ b/engines/agds/detection.cpp
@@ -31,7 +31,7 @@ static const PlainGameDescriptor agdsGames[] = {
 class AGDSMetaEngineDetection : public AdvancedMetaEngineDetection<ADGameDescription> {
 public:
 	AGDSMetaEngineDetection() : AdvancedMetaEngineDetection(AGDS::gameDescriptions, agdsGames) {
-		_maxScanDepth = 3;
+		_maxScanDepth = 1;
 	}
 
 	const char *getName() const override {
diff --git a/engines/agds/detection_tables.h b/engines/agds/detection_tables.h
index d253dad47a3..0dab977c39a 100644
--- a/engines/agds/detection_tables.h
+++ b/engines/agds/detection_tables.h
@@ -19,40 +19,59 @@
  *
  */
 
+#include "engines/advancedDetector.h"
 #include "engines/agds/detection.h"
 
 namespace AGDS {
 
 static const ADGameDescription gameDescriptions[] = {
 
-	// Black Mirror Windows
+	// Black Mirror
 	{
 		"black-mirror",
 		0,
-		AD_ENTRY1s("gfx1.grp", "6665ce103cf12a362fd55f863d1ec9e6", 907820240),
+		AD_ENTRY2s(
+			"gfx1.grp", "6665ce103cf12a362fd55f863d1ec9e6", 907820240,
+			"data.adb", "3b2d85f16e24ac81c4ede7a1da55f786", 2169482),
 		Common::EN_USA,
 		Common::kPlatformWindows,
 		ADGF_DROPPLATFORM,
 		GUIO1(GUIO_NONE)},
 	{"black-mirror",
-	 0,
-	 AD_ENTRY1s("gfx1.grp", "652f931f02c5a79fb9bcbe32abafbdf7", 907732355),
-	 Common::RU_RUS,
+	 "CD version protected with StarForce",
+	 AD_ENTRY2s(
+		 "gfx1.grp", "6665ce103cf12a362fd55f863d1ec9e6", 907820240,
+		 "data.adb", "98d6a1e673e1d3f21be8c89fff25bc4a", 2169482),
+	 Common::EN_USA,
 	 Common::kPlatformWindows,
-	 ADGF_DROPPLATFORM,
+	 ADGF_DROPPLATFORM | ADGF_CD | ADGF_UNSUPPORTED,
 	 GUIO1(GUIO_NONE)},
-
-	{"nibiru",
+	{"black-mirror",
 	 0,
-	 AD_ENTRY1s("gfx1.grp", "40a7a88f77c35305b6aba0329ed8a9ac", 381768750),
-	 Common::EN_USA,
+	 AD_ENTRY2s(
+		 "gfx1.grp", "652f931f02c5a79fb9bcbe32abafbdf7", 907732355,
+		 "data.adb", "d8706b17fb89d58d4dba094a73e5490a", 2152794),
+	 Common::RU_RUS,
 	 Common::kPlatformWindows,
-	 ADGF_DROPPLATFORM | AGDS_V2 | ADGF_UNSTABLE,
+	 ADGF_DROPPLATFORM,
 	 GUIO1(GUIO_NONE)},
 
+	// NiBiRu
+	{
+		"nibiru",
+		0,
+		AD_ENTRY2s(
+			"gfx1.grp", "40a7a88f77c35305b6aba0329ed8a9ac", 381768750,
+			"data.adb", "40a7a88f77c35305b6aba0329ed8a9ac", 1391440),
+		Common::EN_USA,
+		Common::kPlatformWindows,
+		ADGF_DROPPLATFORM | AGDS_V2 | ADGF_UNSTABLE,
+		GUIO1(GUIO_NONE)},
 	{"nibiru",
 	 0,
-	 AD_ENTRY1s("gfx1.grp", "c8e711bc01b16cd82849cbd996d02642", 381768360),
+	 AD_ENTRY2s(
+		 "gfx1.grp", "c8e711bc01b16cd82849cbd996d02642", 381768360,
+		 "data.adb", "40a7a88f77c35305b6aba0329ed8a9ac", 1391440),
 	 Common::RU_RUS,
 	 Common::kPlatformWindows,
 	 ADGF_DROPPLATFORM | AGDS_V2 | ADGF_UNSTABLE,
diff --git a/engines/agds/mjpgPlayer.cpp b/engines/agds/mjpgPlayer.cpp
index 6714982b40b..fa5fd82a6ae 100644
--- a/engines/agds/mjpgPlayer.cpp
+++ b/engines/agds/mjpgPlayer.cpp
@@ -104,7 +104,6 @@ void MJPGPlayer::paint(AGDSEngine &engine, Graphics::Surface &backbuffer) {
 
 		Common::Point dst((backbuffer.w - scaled->w) / 2, (backbuffer.h - scaled->h) / 2);
 		Common::Rect srcRect(scaled->getRect());
-		debug("scaled %u %d", scaled->w, scaled->h);
 		if (Common::Rect::getBlitRect(dst, srcRect, backbuffer.getRect()))
 			backbuffer.copyRectToSurface(*scaled, dst.x, dst.y, srcRect);
 		scaled->free();