[Scummvm-git-logs] scummvm master -> d7d0f9b6c04cd66f6b3987f3c7c091ce1fc2eafb

[neuromancer]

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:
8c14ff08e0 FREESCAPE: initialize _inkColor and _paperColor from Area object
d7d0f9b6c0 FREESCAPE: added detection of zx spectrum disk release of driller


Commit: 8c14ff08e064217ae11cdf7fd45880a33a8e2075
    https://github.com/scummvm/scummvm/commit/8c14ff08e064217ae11cdf7fd45880a33a8e2075
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-01-20T12:22:18+01:00

Commit Message:
FREESCAPE: initialize _inkColor and _paperColor from Area object

Changed paths:
    engines/freescape/area.cpp


diff --git a/engines/freescape/area.cpp b/engines/freescape/area.cpp
index 882a934b889..64304fb9b6e 100644
--- a/engines/freescape/area.cpp
+++ b/engines/freescape/area.cpp
@@ -69,6 +69,8 @@ Area::Area(uint16 areaID_, uint16 areaFlags_, ObjectMap *objectsByID_, ObjectMap
 	_groundColor = 255;
 	_usualBackgroundColor = 255;
 	_underFireBackgroundColor = 255;
+	_inkColor = 255;
+	_paperColor = 255;
 
 	_gasPocketRadius = 0;
 


Commit: d7d0f9b6c04cd66f6b3987f3c7c091ce1fc2eafb
    https://github.com/scummvm/scummvm/commit/d7d0f9b6c04cd66f6b3987f3c7c091ce1fc2eafb
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-01-20T12:22:18+01:00

Commit Message:
FREESCAPE: added detection of zx spectrum disk release of driller

Changed paths:
    engines/freescape/detection.cpp
    engines/freescape/freescape.h
    engines/freescape/games/driller.cpp


diff --git a/engines/freescape/detection.cpp b/engines/freescape/detection.cpp
index eb52adab6c0..86ab3dcd7c7 100644
--- a/engines/freescape/detection.cpp
+++ b/engines/freescape/detection.cpp
@@ -47,6 +47,18 @@ static const ADGameDescription gameDescriptions[] = {
 		GF_ZX_RETAIL | ADGF_TESTING,
 		GUIO2(GUIO_NOMIDI, GAMEOPTION_AUTOMATIC_DRILLING)
 	},
+	{
+		"driller",
+		"",
+		{
+			{"DRILLER.ZX.EXTRACTED", 0, "6876fc03e754137f428bd4d5f16452b5", 37888},
+			AD_LISTEND
+		},
+		Common::EN_ANY,
+		Common::kPlatformZX,
+		GF_ZX_DISC | ADGF_TESTING,
+		GUIO2(GUIO_NOMIDI, GAMEOPTION_AUTOMATIC_DRILLING)
+	},
 	{
 		"driller",
 		"",
diff --git a/engines/freescape/freescape.h b/engines/freescape/freescape.h
index 43752be62cd..2fa4d0f5342 100644
--- a/engines/freescape/freescape.h
+++ b/engines/freescape/freescape.h
@@ -353,10 +353,11 @@ enum DrillerReleaseFlags {
 		GF_AMIGA_BUDGET = (1 << 1),
 		GF_ZX_RETAIL = (1 << 2),
 		GF_ZX_BUDGET = (1 << 3),
-		GF_CPC_RETAIL = (1 << 4),
-		GF_CPC_RETAIL2 = (1 << 5),
-		GF_CPC_BUDGET = (1 << 6),
-		GF_CPC_VIRTUALWORLDS = (1 << 7),
+		GF_ZX_DISC = (1 << 4),
+		GF_CPC_RETAIL = (1 << 5),
+		GF_CPC_RETAIL2 = (1 << 6),
+		GF_CPC_BUDGET = (1 << 7),
+		GF_CPC_VIRTUALWORLDS = (1 << 8),
 };
 
 class DrillerEngine : public FreescapeEngine {
diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller.cpp
index 9a71d97e432..292bedeff42 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller.cpp
@@ -543,19 +543,30 @@ void DrillerEngine::loadAssetsFullGame() {
 		if (!file.isOpen())
 			error("Failed to open driller.zx.extracted");
 
-		loadMessagesFixedSize(&file, 0x20e4, 14, 20);
+		if (_variant & GF_ZX_DISC)
+			loadMessagesFixedSize(&file, 0x2164, 14, 20);
+		else
+			loadMessagesFixedSize(&file, 0x20e4, 14, 20);
 
 		if (_variant & GF_ZX_RETAIL)
 			loadFonts(&file, 0x62ca);
-		if (_variant & GF_ZX_BUDGET)
+		else if (_variant & GF_ZX_BUDGET)
 			loadFonts(&file, 0x5aa8);
+		else if (_variant & GF_ZX_DISC)
+			loadFonts(&file, 0x63f0);
 
-		loadGlobalObjects(&file, 0x1c93);
+		if (_variant & GF_ZX_DISC)
+			loadGlobalObjects(&file, 0x1d13);
+		else
+			loadGlobalObjects(&file, 0x1c93);
 
 		if (_variant & GF_ZX_RETAIL)
 			load8bitBinary(&file, 0x642c, 4);
 		else if (_variant & GF_ZX_BUDGET)
 			load8bitBinary(&file, 0x5c0a, 4);
+		else if (_variant & GF_ZX_DISC)
+			load8bitBinary(&file, 0x6552, 4);
+
 		else
 			error("Unknown ZX spectrum variant");
 	} else if (isCPC()) {