[Scummvm-git-logs] scummvm master -> 21b946645e4488f9dbad9ae655e0fcf4575f2391

[sluicebox]

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:
21b946645e SCI: Add support for LSL1VGA French (fan patch)


Commit: 21b946645e4488f9dbad9ae655e0fcf4575f2391
    https://github.com/scummvm/scummvm/commit/21b946645e4488f9dbad9ae655e0fcf4575f2391
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-04-27T15:03:34-07:00

Commit Message:
SCI: Add support for LSL1VGA French (fan patch)

Fixes bug #12034

Changed paths:
    engines/sci/detection_tables.h
    engines/sci/engine/state.cpp


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index d85fb96b0e..12bce38c9f 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -2554,6 +2554,17 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::PL_POL, Common::kPlatformDOS, 0, GUIO_STD16	},
 
+	// Larry 1 VGA Remake - French fan patch, includes English language
+	// This is the "2.1" patch applied to English version 2.1. bug report #12034
+	{"lsl1sci", "SCI", {
+		{"resource.map", 0, "bbf22cacfcf6ef7e7578045fafad805d", 3337},
+		{"resource.000", 0, "5e501a9bf8c753bf4c96158042422f00", 1938733},
+		{"resource.001", 0, "112648995dbc194037f1e4ed2e195910", 1063341},
+		{"resource.002", 0, "3fe2a3aec0ed53c7d6db1845a67e3aa2", 1095908},
+		{"resource.003", 0, "ac175df0ea9a2cba57f0248651856d27", 376556},
+		AD_LISTEND},
+		Common::FR_FRA, Common::kPlatformDOS, ADGF_ADDENGLISH, GUIO_STD16},
+
 	// Larry 2 - English Amiga (from www.back2roots.org)
 	// Executable scanning reports "x.yyy.zzz"
 	// SCI interpreter version 0.000.572
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp
index 0a92a07a43..99864122e5 100644
--- a/engines/sci/engine/state.cpp
+++ b/engines/sci/engine/state.cpp
@@ -326,6 +326,13 @@ kLanguage SciEngine::getSciLanguage() {
 			switch (getLanguage()) {
 			case Common::FR_FRA:
 				lang = K_LANG_FRENCH;
+				// WORKAROUND: The French version of LSL1VGA is a fan patch that's based
+				// on the official Spanish version, with the Spanish content replaced
+				// with French content. The game scripts require printLang to be Spanish
+				// in order to use the French text and load the correct views.
+				if (g_sci->getGameId() == GID_LSL1) {
+					lang = K_LANG_SPANISH;
+				}
 				break;
 			case Common::ES_ESP:
 				lang = K_LANG_SPANISH;