[Scummvm-git-logs] scummvm master -> 4a306cf391d7b696b7bad080cbe062f22a2e3a78

[alxpnv]

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:
58cdbeab45 ASYLUM: add detection entry for French Steam version
4a306cf391 ASYLUM: fix encounter keywords in non-English Steam versions


Commit: 58cdbeab45697118562e4a048dd80edf6a5e47a9
    https://github.com/scummvm/scummvm/commit/58cdbeab45697118562e4a048dd80edf6a5e47a9
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-09-01T13:04:10+03:00

Commit Message:
ASYLUM: add detection entry for French Steam version

Changed paths:
    engines/asylum/detection_tables.h


diff --git a/engines/asylum/detection_tables.h b/engines/asylum/detection_tables.h
index 4986e862f5..3c22de3e27 100644
--- a/engines/asylum/detection_tables.h
+++ b/engines/asylum/detection_tables.h
@@ -121,6 +121,21 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE | ADGF_DROPPLATFORM,
 		GUIO0()
 	},
+	{
+		"asylum",
+		"Steam",
+		{
+			{"SNTRM.DAT", 0, "e09a12543c6ede1727c8ecffb74e7fd2", 8930},
+			{"RES.000",   0, "94f3c795599ea79492cbf81127944f37", 277935},
+			{"SCN.006",   0, "3a5b54da08198012dc0614114782d5fb", 2918330},
+			{"MOV000_2_SMK.ogv", 0, NULL, -1},
+			AD_LISTEND
+		},
+		Common::FR_FRA,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE | ADGF_DROPPLATFORM,
+		GUIO0()
+	},
 	{
 		"asylum",
 		"French Version",


Commit: 4a306cf391d7b696b7bad080cbe062f22a2e3a78
    https://github.com/scummvm/scummvm/commit/4a306cf391d7b696b7bad080cbe062f22a2e3a78
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-09-01T13:06:45+03:00

Commit Message:
ASYLUM: fix encounter keywords in non-English Steam versions

Changed paths:
    engines/asylum/resources/encounters.cpp


diff --git a/engines/asylum/resources/encounters.cpp b/engines/asylum/resources/encounters.cpp
index b79b0b5add..7489211e13 100644
--- a/engines/asylum/resources/encounters.cpp
+++ b/engines/asylum/resources/encounters.cpp
@@ -101,7 +101,25 @@ Encounter::Encounter(AsylumEngine *engine) : _vm(engine),
 	_data_455BF0 = 0;
 	_data_455BF4 = 0;
 	_keywordStartIndex = 0;
-	_keywordsOffset = _vm->checkGameVersion("Demo") ? 204 : 3681;
+
+	if (_vm->checkGameVersion("Demo")) {
+		_keywordsOffset = 204;
+	} else {
+		switch (_vm->getLanguage()) {
+		default:
+		case Common::EN_ANY:
+			_keywordsOffset = 3681;
+			break;
+
+		case Common::DE_DEU:
+			_keywordsOffset = 1760;
+			break;
+
+		case Common::FR_FRA:
+			_keywordsOffset = 1741;
+			break;
+		}
+	}
 
 	load();
 }
@@ -613,7 +631,23 @@ void Encounter::choose(int32 index) {
 		_value1 = (_item->keywords[index] & KEYWORD_MASK);
 		setVariable(1, _value1);
 
-		if (strcmp("Goodbye", getText()->get(MAKE_RESOURCE(kResourcePackText, _keywordsOffset + _value1))))
+		const char *goodBye;
+		switch (_vm->getLanguage()) {
+		default:
+		case Common::EN_ANY:
+			goodBye = "Goodbye";
+			break;
+
+		case Common::DE_DEU:
+			goodBye = "Auf Wiedersehen";
+			break;
+
+		case Common::FR_FRA:
+			goodBye = "Au Revoir";
+			break;
+		}
+
+		if (strcmp(goodBye, getText()->get(MAKE_RESOURCE(kResourcePackText, _keywordsOffset + _value1))))
 			if (_index != 79)
 				BYTE1(_item->keywords[index]) |= kKeywordOptionsDisabled;