[Scummvm-git-logs] scummvm master -> 485e5def147b7b0de6784807cffa3c41d8b94fab

[waltervn]

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

Summary:
485e5def14 ADL: Add support for hires1 PD variant


Commit: 485e5def147b7b0de6784807cffa3c41d8b94fab
    https://github.com/scummvm/scummvm/commit/485e5def147b7b0de6784807cffa3c41d8b94fab
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2021-07-28T01:07:03+02:00

Commit Message:
ADL: Add support for hires1 PD variant

Changed paths:
    engines/adl/detection.cpp
    engines/adl/disk.h
    engines/adl/hires1.cpp


diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp
index 1ac5217d53..9dd6d6e647 100644
--- a/engines/adl/detection.cpp
+++ b/engines/adl/detection.cpp
@@ -196,13 +196,12 @@ static const AdlGameDescription gameFileDescriptions[] = {
 		GAME_TYPE_HIRES1,
 		GAME_VER_HR1_COARSE
 	},
-	{ // Hi-Res Adventure #1: Mystery House - Apple II - Roberta Williams Anthology
+	{ // Hi-Res Adventure #1: Mystery House - Apple II - Public Domain
 		{
 			"hires1", "Public Domain",
 			{
 				{ "ADVENTURE", 0, "22d9e63a11d69fa033ba1738715ad09a", 29952 },
 				{ "AUTO LOAD OBJ", 0, "23bfccfe9fcff9b22cf6c41bde9078ac", 12291 },
-				{ "MYSTERY.HELLO", 0, "2289b7fea300b506e902a4c597968369", 836 },
 				AD_LISTEND
 			},
 			Common::EN_ANY,
@@ -277,6 +276,18 @@ static const AdlGameDescription gameDiskDescriptions[] = {
 		GAME_TYPE_HIRES1,
 		GAME_VER_HR1_PD
 	},
+	{ // Hi-Res Adventure #1: Mystery House - Apple II - Public Domain
+		{
+			"hires1", "Public Domain",
+			AD_ENTRY1s("mysthous", "bc0f34d153a530b9bb4e554b0a42f8d7", 143360),
+			Common::EN_ANY,
+			Common::kPlatformApple2,
+			ADGF_NO_FLAGS,
+			MH_OPTIONS
+		},
+		GAME_TYPE_HIRES1,
+		GAME_VER_HR1_PD
+	},
 	{ // Hi-Res Adventure #2: Wizard and the Princess - Apple II - DOS 3.2 only
 		{
 			"hires2", "On-Line Systems [A]",
diff --git a/engines/adl/disk.h b/engines/adl/disk.h
index 8759e7efe1..c0547d933b 100644
--- a/engines/adl/disk.h
+++ b/engines/adl/disk.h
@@ -53,6 +53,7 @@ public:
 
 	virtual const DataBlockPtr getDataBlock(const Common::String &filename, uint offset = 0) const = 0;
 	virtual Common::SeekableReadStream *createReadStream(const Common::String &filename, uint offset = 0) const = 0;
+	virtual bool exists(const Common::String &filename) const = 0;
 
 protected:
 	class DataBlock : public Adl::DataBlock {
@@ -126,6 +127,7 @@ class Files_Plain : public Files {
 public:
 	const DataBlockPtr getDataBlock(const Common::String &filename, uint offset = 0) const override;
 	Common::SeekableReadStream *createReadStream(const Common::String &filename, uint offset = 0) const override;
+	bool exists(const Common::String &filename) const override { return Common::File::exists(filename); }
 };
 
 // Data in files contained in Apple DOS 3.3 disk image
@@ -137,6 +139,7 @@ public:
 	bool open(const Common::String &filename);
 	const DataBlockPtr getDataBlock(const Common::String &filename, uint offset = 0) const override;
 	Common::SeekableReadStream *createReadStream(const Common::String &filename, uint offset = 0) const override;
+	bool exists(const Common::String &filename) const override { return _toc.contains(filename); }
 
 private:
 	enum FileType {
diff --git a/engines/adl/hires1.cpp b/engines/adl/hires1.cpp
index 58ea0346a0..6ded4eb474 100644
--- a/engines/adl/hires1.cpp
+++ b/engines/adl/hires1.cpp
@@ -175,11 +175,13 @@ void HiRes1Engine::runIntro() {
 
 	// Show the PD disclaimer for the PD release
 	if (getGameVersion() == GAME_VER_HR1_PD) {
-		// The PD release on the Roberta Williams Anthology disc has a PDE
-		// splash screen. The original HELLO file has been renamed to
-		// MYSTERY.HELLO. It's unclear whether or not this splash screen
-		// was present in the original PD release back in 1987.
-		StreamPtr basic(_files->createReadStream("MYSTERY.HELLO"));
+		// The P.D.E. version on the Roberta Williams Anthology has a renamed HELLO file
+		const char *fileName = "MYSTERY.HELLO";
+
+		if (!_files->exists(fileName))
+			fileName = "HELLO";
+
+		StreamPtr basic(_files->createReadStream(fileName));
 
 		_display->setMode(Display::kModeText);
 		_display->home();