[Scummvm-git-logs] scummvm master -> f95cc105d6dfb1b0852b02ced465c35310346be4
dreammaster
noreply at scummvm.org
Tue Aug 18 20:14:43 UTC 2026
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:
f95cc105d6 M4: RIDDLE: Add missing translations
Commit: f95cc105d6dfb1b0852b02ced465c35310346be4
https://github.com/scummvm/scummvm/commit/f95cc105d6dfb1b0852b02ced465c35310346be4
Author: vorph999 (vorph at gmx.net)
Date: 2026-08-19T06:14:33+10:00
Commit Message:
M4: RIDDLE: Add missing translations
- unify location of items at posh express
- add message log translation (spanish is missing)
Changed paths:
NEWS.md
engines/m4/riddle/riddle.cpp
engines/m4/riddle/rooms/section2/room201.cpp
engines/m4/riddle/rooms/section5/room501.cpp
engines/m4/riddle/rooms/section7/room701.cpp
diff --git a/NEWS.md b/NEWS.md
index 4d202f85109..7592f650650 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -60,6 +60,7 @@ For a more comprehensive changelog of the latest experimental code, see:
- Numerous Riddle of Master Lu fixes for crashes, missing functionality, and game bugs.
- Fixed original game bug where conversations with Wolf could freeze the game.
- Added original game cheat codes for bypassing the maze.
+ - Added translation of message log entries
MM:
- Fix multiple M&M1 classic combat crashes.
diff --git a/engines/m4/riddle/riddle.cpp b/engines/m4/riddle/riddle.cpp
index 080e1846ce4..dd99ae10235 100644
--- a/engines/m4/riddle/riddle.cpp
+++ b/engines/m4/riddle/riddle.cpp
@@ -33,6 +33,36 @@
namespace M4 {
namespace Riddle {
+struct MessageLog {
+ const char *_english;
+ const char *_german;
+ const char *_spanish;
+ const char *_french;
+ const char *_italian;
+};
+
+static const MessageLog MESSAGE_TITLES[] = {
+ {"Reminder from Feng Li", "Erinnerung von Feng Li", "Reminder from Feng Li", "M\x0emo de Feng Li", "Promemoria da Feng Li"},
+ {"Appeal for Oddities from Feng Li", "Bitte von Feng Li um Kuriosit\x06""ten", "Appeal for Oddities from Feng Li", "Demande d'objets de Feng Li", "Richiesta attrazioni da Feng Li"},
+ {"2nd Appeal for Oddities from Feng Li", "2. Bitte von Feng Li um Kuriosit\x06""ten", "2nd Appeal for Oddities from Feng Li", "2\x10 demande d'objets de Feng Li", "2. richiesta attrazioni da Feng Li"},
+ {"3rd Appeal for Oddities from Feng Li", "3. Bitte von Feng Li um Kuriosit\x06""ten", "3rd Appeal for Oddities from Feng Li", "3\x10 demande d'objets de Feng Li", "3. richiesta attrazioni da Feng Li"},
+ {"Urgent Warning from Feng Li", "Dringende Warnung von Feng Li", "Urgent Warning from Feng Li", "Mise end garde urgente de Feng Li", "Avviso urgente da Feng Li"},
+ {"Radiogram from Mei's Aunt & Uncle", "Telegramm von Mei's Tante & Onkel", "Radiogram from Mei's Aunt & Uncle", "Message des tante et oncle de Mei", "Radiogramma dagli zii di Mei"},
+ {"Radiogram from Danzig Chief of Police", "Telegramm vom Danziger Polizeichef", "Radiogram from Danzig Chief of Police", "Message du pr\x0e""fet", "Radiogramma dal capo della polizia di Danzica"},
+ {"Message about Emerald from Feng Li", "Klage \x0e""ber Smaragd von Feng Li", "Message about Emerald from Feng Li", "Message de Feng Li sur l'\x0emeraude", "Messagio sullo smeraldo da Feng Li"},
+ {"Ultimatum about Emerald from Feng Li", "Ultimatum wegen des Smaragds von Feng Li", "Ultimatum about Emerald from Feng Li", "Ultimatum de Feng Li sur l'\x0emeraude", "Ultimatum sullo smeraldo da Feng Li"},
+ {"Refused Delivery", "Annahme verweigert", "Refused Delivery", "Livraison refus\x0e""e", "Consegna rifiutata"},
+ {"Radiogram from Prof. Menendez's Assistant", "Telegramm von Prof. Menendez' Assistenten", "Radiogram from Prof. Menendez's Assistant", "Message de l'assistant de Menendez", "Radiogramma dall'assistente del Prof. Menendey"},
+ {"2nd Radiogram from Prof. Menendez's Assistant", "2. Telegramm von Prof. Menendez' Assistenten", "2nd Radiogram from Prof. Menendez's Assistant", "2\0x10 Message de l'assistant de Menendez", "2. radiogramma dall'assistente del Prof. Menendez"},
+ {"Radiogram from Mei", "Telegramm von Mei", "Radiogram from Mei", "Radiogram de Mei", "Radiogramma da Mei"},
+ {"Thank You Note from Feng Li", "Dankschreiben von Feng Li", "Thank You Note from Feng Li", "Note de remerciment de Feng Li", "Ringraziamento da Feng Li"}
+};
+
+static const MessageLog MESSAGE_OPTIONS[] = {
+ {"MESSAGE LOG", "LOGBUCH F\x04""R TELEGRAMME", "MESSAGE LOG", "CARNET DE MESSAGES", "REGISTRO DEI TELEGRAMMI"},
+ {"CLOSE LOG", "SCHLIESSEN", "CLOSE LOG", "SORTIE", "CHIUDERE"},
+};
+
RiddleEngine::RiddleEngine(OSystem *syst, const M4GameDescription *gameDesc) :
M4Engine(syst, gameDesc) {
_sections.push_back(&_section1);
@@ -587,23 +617,24 @@ void messageLogCallback(TextItem *textItem, TextScrn *textScrn) {
kernel_trigger_dispatchx(_G(messageLogTrigger));
}
+const char* getTranslatedMessageLogItem(const MessageLog* messages, int index) {
+ Common::Language lang = g_engine->getLanguage();
+
+ const char *messageTitle = messages[index]._english;
+ if (lang == Common::DE_DEU)
+ messageTitle = messages[index]._german;
+ else if (lang == Common::ES_ESP)
+ messageTitle = messages[index]._spanish;
+ else if (lang == Common::FR_FRA)
+ messageTitle = messages[index]._french;
+ else if (lang == Common::IT_ITA)
+ messageTitle = messages[index]._italian;
+
+ return messageTitle;
+}
+
+
void RiddleEngine::showMessageLog(int trigger) {
- static const char *MESSAGE_TITLES[14] = {
- "Reminder from Feng Li",
- "Appeal for Oddities from Feng Li",
- "2nd Appeal for Oddities from Feng Li",
- "3rd Appeal for Oddities from Feng Li",
- "Urgent Warning from Feng Li",
- "Radiogram from Mei's Aunt & Uncle",
- "Radiogram from Danzig Chief of Police",
- "Message about Emerald from Feng Li",
- "Ultimatum about Emerald from Feng Li",
- "Refused Delivery",
- "Radiogram from Prof. Menendez's Assistant",
- "2nd Radiogram from Prof. Menendez's Assistant",
- "Radiogram from Mei",
- "Thank You Note from Feng Li"
- };
_G(messageLogTrigger) = kernel_trigger_create(trigger);
gr_font_set(_G(font_inter));
@@ -614,7 +645,7 @@ void RiddleEngine::showMessageLog(int trigger) {
for (int i = 0; i < 14; ++i) {
if (_G(flags)[(Flag)(V350 + i)]) {
++ecx;
- const int width = gr_font_string_width(MESSAGE_TITLES[i], 0);
+ const int width = gr_font_string_width(getTranslatedMessageLogItem(MESSAGE_TITLES,i), 0);
if (width > maxWidth)
maxWidth = width;
}
@@ -625,18 +656,19 @@ void RiddleEngine::showMessageLog(int trigger) {
maxWidth += 16;
_G(messageScreen) = TextScrn_Create(601 - maxWidth, 361 - ((ecx + 2) * (fontHeight + 2) + 16), 600, 360, 65, 422, 13, 15);
- TextScrn_Add_Message(_G(messageScreen), 8, 8, 0, TS_CENTRE, "MESSAGE LOG");
+
+ TextScrn_Add_Message(_G(messageScreen), 8, 8, 0, TS_CENTRE, getTranslatedMessageLogItem(MESSAGE_OPTIONS, 0));
int32 edi = fontHeight + 14;
int i = 0;
for (; i < 14; ++i) {
if (_G(flags)[(Flag)(V350 + i)]) {
- TextScrn_Add_TextItem(_G(messageScreen), 8, edi, i + 1, TS_GIVEN, MESSAGE_TITLES[i], (M4CALLBACK)messageLogCallback);
+ TextScrn_Add_TextItem(_G(messageScreen), 8, edi, i + 1, TS_GIVEN, getTranslatedMessageLogItem(MESSAGE_TITLES, i), (M4CALLBACK)messageLogCallback);
edi += 1 + fontHeight;
}
}
- TextScrn_Add_TextItem(_G(messageScreen), 8, edi + 4, i + 2, TS_GIVEN, "CLOSE LOG", (M4CALLBACK)messageLogCallback);
+ TextScrn_Add_TextItem(_G(messageScreen), 8, edi + 4, i + 2, TS_GIVEN, getTranslatedMessageLogItem(MESSAGE_OPTIONS, 1), (M4CALLBACK)messageLogCallback);
TextScrn_Activate(_G(messageScreen));
}
diff --git a/engines/m4/riddle/rooms/section2/room201.cpp b/engines/m4/riddle/rooms/section2/room201.cpp
index fe0df5aa925..526ff00d948 100644
--- a/engines/m4/riddle/rooms/section2/room201.cpp
+++ b/engines/m4/riddle/rooms/section2/room201.cpp
@@ -1728,7 +1728,7 @@ void Room201::conv201a() {
if (node == 1 && entry == 1) {
int32 x1, y1, x2, y2;
- conv_set_box_xy(490, -4);
+ conv_set_box_xy(10, -4);
conv_get_dlg_coords(&x1, &y1, &x2, &y2);
conv_set_dlg_coords(x1, y1 - 10, x2, y2 - 10);
} else {
diff --git a/engines/m4/riddle/rooms/section5/room501.cpp b/engines/m4/riddle/rooms/section5/room501.cpp
index 3c9700f151e..a6efc958ebc 100644
--- a/engines/m4/riddle/rooms/section5/room501.cpp
+++ b/engines/m4/riddle/rooms/section5/room501.cpp
@@ -1325,7 +1325,7 @@ void Room501::conv501a() {
} else if (who == 1) {
if (node == 1 && entry == 1) {
int32 x1, y1, x2, y2;
- conv_set_box_xy(490, -4);
+ conv_set_box_xy(10, -4);
set_dlg_rect();
conv_get_dlg_coords(&x1, &y1, &x2, &y2);
conv_set_dlg_coords(x1, y1 - 10, x2, y2 - 10);
diff --git a/engines/m4/riddle/rooms/section7/room701.cpp b/engines/m4/riddle/rooms/section7/room701.cpp
index afeee39d802..1b0c710d83b 100644
--- a/engines/m4/riddle/rooms/section7/room701.cpp
+++ b/engines/m4/riddle/rooms/section7/room701.cpp
@@ -1451,11 +1451,10 @@ void Room701::conv701a() {
} else if (who == 1) {
if (_conv701aNode == 1 && entry == 1) {
- conv_set_box_xy(490, -4);
+ conv_set_box_xy(10, -4);
set_dlg_rect();
int32 x1, y1, x2, y2;
conv_get_dlg_coords(&x1, &y1, &x2, &y2);
- conv_get_dlg_coords(&x1, &y1, &x2, &y2); // useless?
conv_set_dlg_coords(x1, y1 - 10, x2, y2 - 10);
set_dlg_rect();
} else {
More information about the Scummvm-git-logs
mailing list