[Scummvm-git-logs] scummvm master -> 4746126d8ef06f4a6fde84af3606e87e797c8b6a

[alxpnv]

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:
4746126d8e ASYLUM: (Board puzzles) add support for French text


Commit: 4746126d8ef06f4a6fde84af3606e87e797c8b6a
    https://github.com/scummvm/scummvm/commit/4746126d8ef06f4a6fde84af3606e87e797c8b6a
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-09-02T15:26:53+03:00

Commit Message:
ASYLUM: (Board puzzles) add support for French text

Changed paths:
    engines/asylum/puzzles/board.h
    engines/asylum/puzzles/boardkeyhidesto.cpp
    engines/asylum/puzzles/boardsalvation.cpp
    engines/asylum/puzzles/boardyouth.cpp


diff --git a/engines/asylum/puzzles/board.h b/engines/asylum/puzzles/board.h
index f7c025eb56..a3b1afe9df 100644
--- a/engines/asylum/puzzles/board.h
+++ b/engines/asylum/puzzles/board.h
@@ -50,7 +50,7 @@ public:
 		uint32 soundResourceSize;
 		SoundResource soundResources[3];
 		uint32 charMapSize;
-		CharMap charMap[10];
+		CharMap charMap[11];
 		bool checkForSpace;
 		uint32 space1Pos, space2Pos;
 		char solvedText[28];
diff --git a/engines/asylum/puzzles/boardkeyhidesto.cpp b/engines/asylum/puzzles/boardkeyhidesto.cpp
index 307e1f0c30..b0b4b8068c 100644
--- a/engines/asylum/puzzles/boardkeyhidesto.cpp
+++ b/engines/asylum/puzzles/boardkeyhidesto.cpp
@@ -47,7 +47,8 @@ static const PuzzleBoard::PuzzleData puzzleKeyHidesToData[] = {
 			{'O',  372, 182},
 			{'K',  210, 215},
 			{'Y',  440, 247},
-			{'T',  479, 262}
+			{'T',  479, 262},
+			{'\0',   0,   0},
 		},
 		true,
 		6, 18,
@@ -71,11 +72,37 @@ static const PuzzleBoard::PuzzleData puzzleKeyHidesToData[] = {
 			{'T',  33, 162},
 			{'I', 527, 162},
 			{'S', 233, 210},
+			{'\0',  0,   0},
 			{'\0',  0,   0}
 		},
 		true,
 		6, 14,
 		"W E G   I S T   Z U R "
+	},
+	// French
+	{
+		56,
+		kGameFlag283,
+		431,
+		3,
+		{{5, false}, {6, false}, {7, false}},
+		7,
+		{
+			{'E',  377,   50},
+			{'L',  357,   66},
+			{'A',  128,   98},
+			{'C',  367,  114},
+			{'L',  237,  130},
+			{'E',   25,  162},
+			{'F',   47,  194},
+			{'\0',   0,    0},
+			{'\0',   0,    0},
+			{'\0',   0,    0},
+			{'\0',   0,    0}
+		},
+		true,
+		4, 0,
+		"L A   C L E F "
 	}
 };
 
diff --git a/engines/asylum/puzzles/boardsalvation.cpp b/engines/asylum/puzzles/boardsalvation.cpp
index eef26e425b..d609619159 100644
--- a/engines/asylum/puzzles/boardsalvation.cpp
+++ b/engines/asylum/puzzles/boardsalvation.cpp
@@ -51,6 +51,7 @@ static const PuzzleBoard::PuzzleData puzzleSalvationData[] = {
 			{'T',  436, 229},
 			{'O',  172, 262},
 			{'N',  393, 296},
+			{'\0',   0,   0},
 			{'\0',   0,   0}
 		},
 		false,
@@ -75,11 +76,37 @@ static const PuzzleBoard::PuzzleData puzzleSalvationData[] = {
 			{'S', 289, 210},
 			{'U', 371, 226},
 			{'\0',  0,   0},
+			{'\0',  0,   0},
 			{'\0',  0,   0}
 		},
 		false,
 		0, 0,
 		"E R L O S U N G "
+	},
+	// French
+	{
+		31,
+		kGameFlag281,
+		431,
+		3,
+		{{0, false}, {1, false}, {2, false}},
+		7,
+		{
+			{'D',  54,  50},
+			{'U', 266,  66},
+			{'S', 540,  82},
+			{'A',  49, 130},
+			{'L', 199, 162},
+			{'U', 442, 178},
+			{'T', 369, 210},
+			{'\0',  0,   0},
+			{'\0',  0,   0},
+			{'\0',  0,   0},
+			{'\0',  0,   0}
+		},
+		true,
+		4, 0,
+		"D U   S A L U T "
 	}
 };
 
@@ -113,6 +140,11 @@ bool PuzzleBoardSalvation::mouseLeftDown(const AsylumEvent &) {
 			_solvedText[_position++] = _data.charMap[index].character;
 			_solvedText[_position++] = ' ';
 
+			if (_position == _data.space1Pos) {
+				_solvedText[_position++] = ' ';
+				_solvedText[_position++] = ' ';
+			}
+
 			updateScreen();
 		}
 	} else if (_vm->isGameFlagNotSet(kGameFlag281)) {
diff --git a/engines/asylum/puzzles/boardyouth.cpp b/engines/asylum/puzzles/boardyouth.cpp
index a312ef4ee8..99fbf5b482 100644
--- a/engines/asylum/puzzles/boardyouth.cpp
+++ b/engines/asylum/puzzles/boardyouth.cpp
@@ -47,6 +47,7 @@ static const PuzzleBoard::PuzzleData puzzleYouthData[] = {
 			{'H',  497, 198},
 			{'Y',  435, 231},
 			{'\0',   0,   0},
+			{'\0',   0,   0},
 			{'\0',   0,   0}
 		},
 		true,
@@ -71,11 +72,37 @@ static const PuzzleBoard::PuzzleData puzzleYouthData[] = {
 			{'R', 261, 194},
 			{'E', 390, 210},
 			{'D', 470, 226},
+			{'\0',  0,   0},
 			{'\0',  0,   0}
 		},
 		true,
 		12, 0,
 		"J U G E N D   D E R "
+	},
+	// French
+	{
+		55,
+		kGameFlag282,
+		503,
+		2,
+		{{3, false}, {4, false}, {0, false}},
+		11,
+		{
+			{'E',  64,  50},
+			{'S', 514,  50},
+			{'T', 192,  98},
+			{'J', 297, 114},
+			{'E', 595, 130},
+			{'S',  62, 146},
+			{'U', 376, 146},
+			{'N', 281, 162},
+			{'E', 482, 178},
+			{'E',  66, 194},
+			{'S', 133, 210},
+		},
+		true,
+		6, 0,
+		"E S T   J E U N E S S E "
 	}
 };