[Scummvm-git-logs] scummvm master -> 1f9b65d436de7644f903786853d32eb9dc92dbc6

[lephilousophe]

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:
1f9b65d436 CRYOMNI3D: Add support for Chinese DOS/Win95 Versailles CD version


Commit: 1f9b65d436de7644f903786853d32eb9dc92dbc6
    https://github.com/scummvm/scummvm/commit/1f9b65d436de7644f903786853d32eb9dc92dbc6
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-07-06T21:32:23+02:00

Commit Message:
CRYOMNI3D: Add support for Chinese DOS/Win95 Versailles CD version

Also fix a missing callback for the DVD version too

Changed paths:
    engines/cryomni3d/detection_tables.h
    engines/cryomni3d/versailles/dialogs.cpp
    engines/cryomni3d/versailles/engine.cpp


diff --git a/engines/cryomni3d/detection_tables.h b/engines/cryomni3d/detection_tables.h
index d611ce054e5..4a061ad9f51 100644
--- a/engines/cryomni3d/detection_tables.h
+++ b/engines/cryomni3d/detection_tables.h
@@ -535,6 +535,57 @@ static const CryOmni3DGameDescription gameDescriptions[] = {
 		/* GF_VERSAILLES_FONTS_ | */ GF_VERSAILLES_AUDIOPADDING_YES,
 	},
 
+	// Versailles 1685
+	// Chinese Windows 95 from hybrid Win95/DOS CD
+	// From kane159. on Discord
+	{
+		{
+			"versailles",
+			"",
+			VERSAILLES_ENTRY_DEF("VERSAILL.EXE", "6b30654356ac219d2dda7ad8054146e4", 386048),
+			Common::ZH_TWN,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUI_OPTIONS_VERSAILLES
+		},
+		GType_VERSAILLES,
+		/* GF_VERSAILLES_FONTS_ | */ GF_VERSAILLES_AUDIOPADDING_YES | GF_VERSAILLES_LINK_STANDARD,
+	},
+
+	// Versailles 1685
+	// Chinese Windows 95 compressed from hybrid Win95/DOS CD
+	// From kane159. on Discord
+	{
+		{
+			"versailles",
+			"",
+			VERSAILLES_ENTRY_DEF("PROGRAM.Z", "62e0d8a68ce0ec92db5d1699db8679ec", 262633),
+			Common::ZH_TWN,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUI_OPTIONS_VERSAILLES
+		},
+		GType_VERSAILLES,
+		/* GF_VERSAILLES_FONTS_ | */ GF_VERSAILLES_AUDIOPADDING_YES | GF_VERSAILLES_LINK_STANDARD,
+	},
+
+	// Versailles 1685
+	// Chinese DOS from hybrid Win95/DOS CD
+	// From kane159. on Discord
+	{
+		{
+			"versailles",
+			"",
+			VERSAILLES_ENTRY_DEF("VERSAILL.PGM", "1c992f034f43418a5da2e8ebd0b92620", 725487),
+			Common::ZH_TWN,
+			Common::kPlatformDOS,
+			ADGF_NO_FLAGS,
+			GUI_OPTIONS_VERSAILLES
+		},
+		GType_VERSAILLES,
+		/* GF_VERSAILLES_FONTS_ | */ GF_VERSAILLES_AUDIOPADDING_YES | GF_VERSAILLES_LINK_STANDARD,
+	},
+
 	// Versailles 1685
 	// English DOS Non-interactive Demo (US)
 	{
diff --git a/engines/cryomni3d/versailles/dialogs.cpp b/engines/cryomni3d/versailles/dialogs.cpp
index 50ceb144611..55a39430da1 100644
--- a/engines/cryomni3d/versailles/dialogs.cpp
+++ b/engines/cryomni3d/versailles/dialogs.cpp
@@ -212,6 +212,8 @@ void CryOmni3DEngine_Versailles::setupDialogShows() {
 	                                 &CryOmni3DEngine_Versailles::dialogShowLaChaizeGivesBack);
 	_dialogsMan.registerShowCallback("(LA CHAIZE " "\x83" "CRIT DRAGONNADES)",
 	                                 &CryOmni3DEngine_Versailles::dialogShowLaChaizeWrites);
+	_dialogsMan.registerShowCallback("(LA CHAIZE " "\x8e" "CRIT DRAGONNADES)",
+	                                 &CryOmni3DEngine_Versailles::dialogShowLaChaizeWrites);
 	_dialogsMan.registerShowCallback("(LACHAIZE-DONNE-PAMPHLET-JOUEUR)",
 	                                 &CryOmni3DEngine_Versailles::dialogShowLaChaizeGivesPamphlet);
 	_dialogsMan.registerShowCallback("(BONTEMPS-DONNE-CLEF-DES-COMBLES)",
diff --git a/engines/cryomni3d/versailles/engine.cpp b/engines/cryomni3d/versailles/engine.cpp
index bb333298664..a7782f4acb1 100644
--- a/engines/cryomni3d/versailles/engine.cpp
+++ b/engines/cryomni3d/versailles/engine.cpp
@@ -596,10 +596,14 @@ void CryOmni3DEngine_Versailles::setupFonts() {
 void CryOmni3DEngine_Versailles::setupSprites() {
 	Common::File file;
 
-	Common::String fName = (getLanguage() == Common::ZH_TWN ? "allsprtw.bin" : "all_spr.bin");
-
-	if (!file.open(getFilePath(kFileTypeSprite, fName))) {
-		error("Failed to open all_spr.bin file");
+	if (!file.open(getFilePath(kFileTypeSprite, "all_spr.bin"))) {
+		// Try with TW specific file
+		if (getLanguage() == Common::ZH_TWN &&
+			!file.open(getFilePath(kFileTypeSprite, "allsprtw.bin"))) {
+			error("Failed to open all_spr.bin and allsprtw.bin file");
+		} else {
+			error("Failed to open all_spr.bin file");
+		}
 	}
 	_sprites.loadSprites(file);