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

[athrxx]

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:
d6e9afa272 SCI: (ECOQUEST2/Windows) - enable 16 colors mode


Commit: d6e9afa272e164f9930866b3e2ed7cf1eee4e5ba
    https://github.com/scummvm/scummvm/commit/d6e9afa272e164f9930866b3e2ed7cf1eee4e5ba
Author: athrxx (athrxx at scummvm.org)
Date: 2025-02-10T18:51:02+01:00

Commit Message:
SCI: (ECOQUEST2/Windows) - enable 16 colors mode

(version found on Sierra's School House Math CD)

Changed paths:
    engines/sci/detection_internal.cpp
    engines/sci/detection_tables.h
    engines/sci/graphics/cursor.cpp


diff --git a/engines/sci/detection_internal.cpp b/engines/sci/detection_internal.cpp
index 6c3a0f6fcb7..2ac90f10af6 100644
--- a/engines/sci/detection_internal.cpp
+++ b/engines/sci/detection_internal.cpp
@@ -138,6 +138,7 @@ Common::String customizeGuiOptions(Common::Path gamePath, Common::String guiOpti
 
 	static const char *sci11WinTargets[] = {
 		"ecoquest",
+		"ecoquest2",
 		"kq6",
 		"laurabow2",
 		"pepper",
diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 18b3394be4f..9e214b01259 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -706,6 +706,15 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::FR_FRA, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16	},
 
+#define GUIO_ECO2_WINDOWS GUIO8(GUIO_NOSPEECH,\
+					GAMEOPTION_WINDOWS_CURSORS,\
+					GAMEOPTION_PREFER_DIGITAL_SFX,\
+					GAMEOPTION_ORIGINAL_SAVELOAD,\
+					GAMEOPTION_MIDI_MODE,\
+					GAMEOPTION_RGB_RENDERING,\
+					GAMEOPTION_TTS,\
+					GAMEOPTION_ENABLE_GMM_SAVE)
+
 	// Eco Quest 2 - English DOS Non-Interactive Demo
 	// SCI interpreter version 1.001.055
 	{"ecoquest2", "Demo", {
@@ -722,6 +731,14 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_STD16	},
 
+	// Eco Quest 2 - Included as a bonus game in Sierra's School House.
+	// Executable scanning reports "1.001.069", VERSION file reports "1.000.000"
+	{"ecoquest2", "CD", {
+		{"resource.map", 0, "28fb7b6abb9fc1cb8882d7c2e701b63f", 5658},
+		{"resource.000", 0, "cc1d17e5637528dbe4a812699e1cbfc6", 4208192},
+		AD_LISTEND},
+		Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, GUIO_ECO2_WINDOWS },
+
 	// Eco Quest 2 - French DOS Floppy (from Strangerke)
 	// SCI interpreter version 1.001.081
 	{"ecoquest2", "Floppy", {
@@ -762,6 +779,8 @@ static const struct ADGameDescription SciGameDescriptions[] = {
         AD_LISTEND},
         Common::KO_KOR, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO_STD16 },
 
+#undef GUIO_ECO2_WINDOWS
+
 	// Freddy Pharkas - English DOS demo (from FRG)
 	// SCI interpreter version 1.001.069
 	{"freddypharkas", "Demo", {
diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index 3425c8ea1ee..36bc7892693 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -62,7 +62,7 @@ GfxCursor::GfxCursor(ResourceManager *resMan, GfxPalette *palette, GfxScreen *sc
 	if (g_sci && g_sci->getPlatform() == Common::kPlatformWindows) {
 		int gid = g_sci->getGameId();
 		if (ConfMan.getBool("windows_cursors")) {
-			if (gid == GID_KQ6 || gid == GID_LAURABOW2)
+			if (gid == GID_KQ6 || gid == GID_LAURABOW2 || gid == GID_ECOQUEST2)
 				_winCursorStyle = kWinCursorStyleBWAlt2;
 			else if (gid == GID_SQ4 || gid == GID_PEPPER)
 				_winCursorStyle = kWinCursorStyleBWAlt1;