[Scummvm-git-logs] scummvm master -> 7eea5d9168a36c5f9af178fcbca1ef20c4bf6e9c

yuv422 noreply at scummvm.org
Sat Jan 11 00:17:50 UTC 2025


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:
167a42f88c DARKSEED: Added more localised text
7eea5d9168 DARKSEED: Localise menu text


Commit: 167a42f88cb46c57d4ef12ab618e0f461583443c
    https://github.com/scummvm/scummvm/commit/167a42f88cb46c57d4ef12ab618e0f461583443c
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2025-01-10T16:16:20-08:00

Commit Message:
DARKSEED: Added more localised text

Changed paths:
    engines/darkseed/langtext.h
    engines/darkseed/usecode.cpp


diff --git a/engines/darkseed/langtext.h b/engines/darkseed/langtext.h
index 47d8c63cfdd..b39f77c1f03 100644
--- a/engines/darkseed/langtext.h
+++ b/engines/darkseed/langtext.h
@@ -285,6 +285,41 @@ constexpr I18nText kI18N_youDontWantToLeaveTheObjectUnderTheBedText = {
 	"DU WILLST %s NICHT UNTER DEM BETT LASSEN."
 };
 
+constexpr I18nText kI18N_genResponse0_usingTheObjectOnTheObjectItMustBeYourHeadachesText = {
+	"Using the %s on the %s doesn't make any sense, it must be your headaches!",
+	"UTILIZAR %s EN %s NO TIENE SENTIDO, TE PRODUCIRA DOLOR DE CABEZA",
+	"POURQUOI UTILISER %s SUR %s PRENEZ DONC DE L'ASPIRINE!",
+	"GEBRAUCHEN VON %s AUF %s MACHT KEINEN SINN, DAS MUSS AN DEINEN KOPFSCHMERZEN LIEGEN!"
+};
+
+constexpr I18nText kI18N_genResponse1_theObjectWillDoNothingToTheText = {
+	"The %s will do nothing to the %s.",
+	"%s NO TIENE NADA QUE VER CON %s.",
+	"%s NE FERONT RIEN A %s.",
+	"%s HAT NICHTS ZU TUN MIT %s"
+};
+
+constexpr I18nText kI18N_genResponse2_theObjectDoesntHaveAnyEffectOnTheText = {
+	"The %s doesn't have any effect on the %s.",
+	"%s NO LE CAUSARA EFECTO A %s.",
+	"%s N'AURA AUCUN EFFET SUR %s.",
+	"%s BEWIRKT NICHTS MIT %s."
+};
+
+constexpr I18nText kI18N_genResponse3_theObjectHasNothingToDoWithTheText = {
+	"The %s has nothing to do with %s.",
+	"%s NO TIENE NADA QUE VER CON %s.",
+	"%s N'A AUCUN RAPPORT AVEC %s.",
+	"%s HAT NICHTS ZU TUN MIT %s."
+};
+
+constexpr I18nText kI18N_genResponse4_areYouFeelingAlrightText = {
+	"Are you feeling alright?",
+	"TE ENCUENTRAS BIEN?",
+	"VOUS ETES SUR QUE CA VA BIEN?",
+	"FUEHLST DU DICH GUT?"
+};
+
 constexpr I18nText kI18N_blankText = {
 	"",
 	"",
diff --git a/engines/darkseed/usecode.cpp b/engines/darkseed/usecode.cpp
index da2858907e8..b44edc73ef7 100644
--- a/engines/darkseed/usecode.cpp
+++ b/engines/darkseed/usecode.cpp
@@ -1674,7 +1674,7 @@ void UseCode::genericResponse(int16 useObjNum, int16 targetObjNum, int16 tosIdx)
 		case 0:
 			_console->addTextLine(
 				Common::String::format(
-					"Using the %s on the %s doesn't make any sense, it must be your headaches!",
+					getI18NText(kI18N_genResponse0_usingTheObjectOnTheObjectItMustBeYourHeadachesText),
 					_objectVar.getObjectName(useObjNum),
 					_objectVar.getObjectName(targetObjNum)
 				)
@@ -1683,7 +1683,7 @@ void UseCode::genericResponse(int16 useObjNum, int16 targetObjNum, int16 tosIdx)
 		case 1:
 			_console->addTextLine(
 				Common::String::format(
-					"The %s will do nothing to the %s.",
+					getI18NText(kI18N_genResponse1_theObjectWillDoNothingToTheText),
 					_objectVar.getObjectName(useObjNum),
 					_objectVar.getObjectName(targetObjNum)
 				)
@@ -1692,7 +1692,7 @@ void UseCode::genericResponse(int16 useObjNum, int16 targetObjNum, int16 tosIdx)
 		case 2:
 			_console->addTextLine(
 				Common::String::format(
-					"The %s doesn't have any effect on the %s.",
+					getI18NText(kI18N_genResponse2_theObjectDoesntHaveAnyEffectOnTheText),
 					_objectVar.getObjectName(useObjNum),
 					_objectVar.getObjectName(targetObjNum)
 				)
@@ -1701,14 +1701,14 @@ void UseCode::genericResponse(int16 useObjNum, int16 targetObjNum, int16 tosIdx)
 		case 3:
 			_console->addTextLine(
 				Common::String::format(
-					"The %s has nothing to do with %s.",
+					getI18NText(kI18N_genResponse3_theObjectHasNothingToDoWithTheText),
 					_objectVar.getObjectName(useObjNum),
 					_objectVar.getObjectName(targetObjNum)
 				)
 			);
 			break;
 		case 4:
-			_console->addTextLine("Are you feeling alright?");
+			_console->addTextLine(getI18NText(kI18N_genResponse4_areYouFeelingAlrightText));
 			break;
 		default:
 			error("Unhandled _genericResponseCounter value");


Commit: 7eea5d9168a36c5f9af178fcbca1ef20c4bf6e9c
    https://github.com/scummvm/scummvm/commit/7eea5d9168a36c5f9af178fcbca1ef20c4bf6e9c
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2025-01-10T16:16:20-08:00

Commit Message:
DARKSEED: Localise menu text

Changed paths:
    engines/darkseed/menu.cpp
    engines/darkseed/menu.h


diff --git a/engines/darkseed/menu.cpp b/engines/darkseed/menu.cpp
index 4b91dbb0e0f..e3e268048ea 100644
--- a/engines/darkseed/menu.cpp
+++ b/engines/darkseed/menu.cpp
@@ -26,12 +26,54 @@
 
 namespace Darkseed {
 
-void drawSoundMenuItem() {
-	g_engine->_screen->fillRect({{117, 136}, 55, 11}, 0);
+constexpr I18nMenuText kMenu_load = {
+	{127, 62, "Load"},
+	{118, 62, "CARGAR"},
+	{114, 62, "CHARGER"},
+	{127, 62, "LADEN"}
+};
+
+constexpr I18nMenuText kMenu_silent = {
+	{123, 136, "Silent"},
+	{115, 136, "SIN SON"},
+	{114, 136, "SILENCE"},
+	{127, 136, "RUHE"}
+};
+
+constexpr I18nMenuText kMenu_sounds = {
+	{117, 136, "Sounds"},
+	{118, 136, "SONIDO"},
+	{114, 136, "SONS"},
+	{127, 136, "SOUND"}
+};
+
+constexpr I18nMenuText kMenu_save = {
+	{127, 99, "Save"},
+	{118, 99, "GRABAR"},
+	{114, 99, "SAUVER"},
+	{127, 99, "SICHERN"}
+};
+
+constexpr I18nMenuText kMenu_resume = {
+	{118, 173, "Resume"},
+	{120, 173, "SEQUIR"},
+	{110, 173, "CONTINUER"},
+	{127, 173, "MEHR"}
+};
+
+constexpr I18nMenuText kMenu_quit = {
+	{129, 210, "Quit"},
+	{125, 210, "SALIR"},
+	{110, 210, "QUITTER"},
+	{127, 210, "AUSGANG"}
+};
+
+void Menu::drawSoundMenuItem() {
+	g_engine->_screen->fillRect({{115, 136}, 61, 11}, 0);
 	if (g_engine->_sound->isMuted()) {
-		g_engine->_console->drawStringAt(123, 136, "Silent");
+		drawMenuItem(kMenu_silent);
 	} else {
-		g_engine->_console->drawStringAt(117, 136, "Sounds");
+		drawMenuItem(kMenu_sounds);
 	}
 }
 
@@ -45,11 +87,11 @@ void Menu::loadMenu() {
 	g_engine->drawFullscreenPic();
 	g_engine->_console->draw(true);
 
-	g_engine->_console->drawStringAt(127, 62, "Load");
-	g_engine->_console->drawStringAt(127, 99, "Save");
+	drawMenuItem(kMenu_load);
+	drawMenuItem(kMenu_save);
 	drawSoundMenuItem();
-	g_engine->_console->drawStringAt(118, 173, "Resume");
-	g_engine->_console->drawStringAt(129, 210, "Quit");
+	drawMenuItem(kMenu_resume);
+	drawMenuItem(kMenu_quit);
 
 	g_engine->_screen->makeAllDirty();
 	g_engine->_screen->update();
@@ -140,4 +182,13 @@ void Menu::loadMenu() {
 	_open = false;
 }
 
+void Menu::drawMenuItem(const I18nMenuText &menuText) {
+	switch (g_engine->getLanguage()) {
+	case Common::ES_ESP : g_engine->_console->drawStringAt(menuText.es.x, menuText.es.y, menuText.es.text); break;
+	case Common::FR_FRA : g_engine->_console->drawStringAt(menuText.fr.x, menuText.fr.y, menuText.fr.text); break;
+	case Common::DE_DEU : g_engine->_console->drawStringAt(menuText.de.x, menuText.de.y, menuText.de.text); break;
+	default: g_engine->_console->drawStringAt(menuText.en.x, menuText.en.y, menuText.en.text); break;
+	}
+}
+
 } // End of namespace Darkseed
diff --git a/engines/darkseed/menu.h b/engines/darkseed/menu.h
index eb70d92a398..074b1aeebba 100644
--- a/engines/darkseed/menu.h
+++ b/engines/darkseed/menu.h
@@ -24,6 +24,19 @@
 
 namespace Darkseed {
 
+struct menuText {
+	int x;
+	int y;
+	const char *text;
+};
+
+struct I18nMenuText {
+	const menuText en;
+	const menuText es;
+	const menuText fr;
+	const menuText de;
+};
+
 class Menu {
 private:
 	bool _open = false;
@@ -31,6 +44,9 @@ public:
 	bool isOpen() const { return _open; }
 
 	void loadMenu();
+private:
+	void drawSoundMenuItem();
+	void drawMenuItem(const I18nMenuText &menuText);
 };
 
 } // namespace Darkseed




More information about the Scummvm-git-logs mailing list