[Scummvm-git-logs] scummvm master -> 23dd283457984ff35f968ca9f23df789e84c7fdb

[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:
164353c5ff ASYLUM: add support for the Russian version
23dd283457 ASYLUM: (BoardKeyHidesTo puzzle) fix French data


Commit: 164353c5ffdade07466a787bc696b8caa1126a6f
    https://github.com/scummvm/scummvm/commit/164353c5ffdade07466a787bc696b8caa1126a6f
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-09-06T14:55:42+03:00

Commit Message:
ASYLUM: add support for the Russian version

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


diff --git a/engines/asylum/puzzles/board.cpp b/engines/asylum/puzzles/board.cpp
index 6274d39f7e..06784ff487 100644
--- a/engines/asylum/puzzles/board.cpp
+++ b/engines/asylum/puzzles/board.cpp
@@ -37,11 +37,23 @@
 namespace Asylum {
 
 PuzzleBoard::PuzzleBoard(AsylumEngine *engine, const PuzzleData *data) : Puzzle(engine) {
-	const Common::Language supportedLanguages[] = {Common::EN_ANY, Common::DE_DEU, Common::FR_FRA};
-
 	int i = 0;
-	while (_vm->getLanguage() != supportedLanguages[i])
-		i++;
+
+	switch (_vm->getLanguage()) {
+	default:
+	case Common::EN_ANY:
+	case Common::RU_RUS:
+		i = 0;
+		break;
+
+	case Common::DE_DEU:
+		i = 1;
+		break;
+
+	case Common::FR_FRA:
+		i = 2;
+		break;
+	}
 
 	memcpy(&_data, &data[i], sizeof(PuzzleData));
 
diff --git a/engines/asylum/resources/encounters.cpp b/engines/asylum/resources/encounters.cpp
index 7489211e13..a93084dacf 100644
--- a/engines/asylum/resources/encounters.cpp
+++ b/engines/asylum/resources/encounters.cpp
@@ -645,6 +645,10 @@ void Encounter::choose(int32 index) {
 		case Common::FR_FRA:
 			goodBye = "Au Revoir";
 			break;
+
+		case Common::RU_RUS:
+			goodBye = "\xc4\xee\x20\xf1\xe2\xe8\xe4\xe0\xed\xe8\xff"; // До свидания
+			break;
 		}
 
 		if (strcmp(goodBye, getText()->get(MAKE_RESOURCE(kResourcePackText, _keywordsOffset + _value1))))


Commit: 23dd283457984ff35f968ca9f23df789e84c7fdb
    https://github.com/scummvm/scummvm/commit/23dd283457984ff35f968ca9f23df789e84c7fdb
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-09-06T14:55:42+03:00

Commit Message:
ASYLUM: (BoardKeyHidesTo puzzle) fix French data

Changed paths:
    engines/asylum/puzzles/boardkeyhidesto.cpp


diff --git a/engines/asylum/puzzles/boardkeyhidesto.cpp b/engines/asylum/puzzles/boardkeyhidesto.cpp
index b0b4b8068c..53da3b8e22 100644
--- a/engines/asylum/puzzles/boardkeyhidesto.cpp
+++ b/engines/asylum/puzzles/boardkeyhidesto.cpp
@@ -86,9 +86,8 @@ static const PuzzleBoard::PuzzleData puzzleKeyHidesToData[] = {
 		431,
 		3,
 		{{5, false}, {6, false}, {7, false}},
-		7,
+		6,
 		{
-			{'E',  377,   50},
 			{'L',  357,   66},
 			{'A',  128,   98},
 			{'C',  367,  114},
@@ -98,6 +97,7 @@ static const PuzzleBoard::PuzzleData puzzleKeyHidesToData[] = {
 			{'\0',   0,    0},
 			{'\0',   0,    0},
 			{'\0',   0,    0},
+			{'\0',   0,    0},
 			{'\0',   0,    0}
 		},
 		true,