[Scummvm-git-logs] scummvm master -> 303aacf1762b8d20515ac744ce1918b0e6281362
yuv422
noreply at scummvm.org
Mon Jan 13 05:18:53 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:
447f5142af DARKSEED: Fixed position of localised menu items. Added localised quit confirmation keycodes.
303aacf176 DARKSEED: Mark ES, FR and DE DOS CD versions as ready for testing.
Commit: 447f5142af5d413cf80b1faa3f44631478ad2849
https://github.com/scummvm/scummvm/commit/447f5142af5d413cf80b1faa3f44631478ad2849
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2025-01-13T16:14:19+11:00
Commit Message:
DARKSEED: Fixed position of localised menu items. Added localised quit confirmation keycodes.
Changed paths:
engines/darkseed/menu.cpp
engines/darkseed/menu.h
diff --git a/engines/darkseed/menu.cpp b/engines/darkseed/menu.cpp
index 87ca54bf624..b93737f5d8b 100644
--- a/engines/darkseed/menu.cpp
+++ b/engines/darkseed/menu.cpp
@@ -29,44 +29,44 @@ namespace Darkseed {
constexpr I18NTextWithPosition kMenu_load = {
{127, 62, "Load"},
- {118, 62, "CARGAR"},
- {114, 62, "CHARGER"},
- {127, 62, "LADEN"}
+ {119, 62, "CARGAR"},
+ {118, 62, "CHARGER"},
+ {121, 62, "LADEN"}
};
constexpr I18NTextWithPosition kMenu_silent = {
{123, 136, "Silent"},
{115, 136, "SIN SON"},
- {114, 136, "SILENCE"},
- {127, 136, "RUHE"}
+ {118, 136, "SILENCE"},
+ {129, 136, "RUHE"}
};
constexpr I18NTextWithPosition kMenu_sounds = {
{117, 136, "Sounds"},
- {118, 136, "SONIDO"},
- {114, 136, "SONS"},
- {127, 136, "SOUND"}
+ {121, 136, "SONIDO"},
+ {126, 136, "SONS"},
+ {123, 136, "SOUND"}
};
constexpr I18NTextWithPosition kMenu_save = {
{127, 99, "Save"},
- {118, 99, "GRABAR"},
- {114, 99, "SAUVER"},
- {127, 99, "SICHERN"}
+ {119, 99, "GRABAR"},
+ {121, 99, "SAUVER"},
+ {115, 99, "SICHERN"}
};
constexpr I18NTextWithPosition kMenu_resume = {
{118, 173, "Resume"},
- {120, 173, "SEQUIR"},
- {110, 173, "CONTINUER"},
- {127, 173, "MEHR"}
+ {122, 173, "SEQUIR"},
+ {124, 173, "JOUER"},
+ {118, 173, "WEITER"}
};
constexpr I18NTextWithPosition kMenu_quit = {
{129, 210, "Quit"},
{125, 210, "SALIR"},
- {110, 210, "QUITTER"},
- {127, 210, "AUSGANG"}
+ {117, 210, "QUITTER"},
+ {129, 210, "ENDE"}
};
void drawMenuItem(const I18NTextWithPosition &menuText) {
@@ -75,7 +75,7 @@ void drawMenuItem(const I18NTextWithPosition &menuText) {
}
void Menu::drawSoundMenuItem() {
- g_engine->_screen->fillRect({{115, 136}, 61, 11}, 0);
+ g_engine->_screen->fillRect({{115, 136}, 62, 11}, 0);
if (g_engine->_sound->isMuted()) {
drawMenuItem(kMenu_silent);
} else {
@@ -83,6 +83,15 @@ void Menu::drawSoundMenuItem() {
}
}
+Common::KeyCode Menu::getLocalisedConfirmToQuitKeycode() {
+ switch (g_engine->getLanguage()) {
+ case Common::ES_ESP : return Common::KeyCode::KEYCODE_s;
+ case Common::FR_FRA : return Common::KeyCode::KEYCODE_o;
+ case Common::DE_DEU : return Common::KeyCode::KEYCODE_j;
+ default : return Common::KeyCode::KEYCODE_y;
+ }
+}
+
void Menu::loadMenu() {
_open = true;
Graphics::Surface screenCopy;
@@ -163,7 +172,7 @@ void Menu::loadMenu() {
g_engine->_lastKeyPressed = Common::KeyCode::KEYCODE_INVALID;
while (!g_engine->shouldQuit()) {
g_engine->updateEvents();
- if (g_engine->_lastKeyPressed == Common::KeyCode::KEYCODE_y || g_engine->_isLeftMouseClicked) {
+ if (g_engine->_lastKeyPressed == getLocalisedConfirmToQuitKeycode() || g_engine->_isLeftMouseClicked) {
g_engine->quitGame();
break;
}
diff --git a/engines/darkseed/menu.h b/engines/darkseed/menu.h
index b3e132e9276..ef96200dc77 100644
--- a/engines/darkseed/menu.h
+++ b/engines/darkseed/menu.h
@@ -33,6 +33,7 @@ public:
void loadMenu();
private:
void drawSoundMenuItem();
+ Common::KeyCode getLocalisedConfirmToQuitKeycode();
};
} // namespace Darkseed
Commit: 303aacf1762b8d20515ac744ce1918b0e6281362
https://github.com/scummvm/scummvm/commit/303aacf1762b8d20515ac744ce1918b0e6281362
Author: Eric Fry (yuv422 at reversedgames.com)
Date: 2025-01-13T16:18:16+11:00
Commit Message:
DARKSEED: Mark ES, FR and DE DOS CD versions as ready for testing.
Changed paths:
engines/darkseed/detection_tables.h
diff --git a/engines/darkseed/detection_tables.h b/engines/darkseed/detection_tables.h
index dd2b11c733a..529cf251c19 100644
--- a/engines/darkseed/detection_tables.h
+++ b/engines/darkseed/detection_tables.h
@@ -87,7 +87,7 @@ const ADGameDescription gameDescriptions[] = {
AD_ENTRY1s("TOS.EXE", "57581682c29fc7d242b463210b6e54b4", 144422),
Common::DE_DEU,
Common::kPlatformDOS,
- ADGF_UNSTABLE | ADGF_CD,
+ ADGF_TESTING | ADGF_CD,
GUIO1(GUIO_NONE)
},
{
@@ -96,7 +96,7 @@ const ADGameDescription gameDescriptions[] = {
AD_ENTRY1s("TOS.EXE", "9b8cdd3b4268d18babf7629fca6a271e", 143534),
Common::FR_FRA,
Common::kPlatformDOS,
- ADGF_UNSTABLE | ADGF_CD,
+ ADGF_TESTING | ADGF_CD,
GUIO1(GUIO_NONE)
},
{
@@ -105,7 +105,7 @@ const ADGameDescription gameDescriptions[] = {
AD_ENTRY1s("TOS.EXE", "3c00f3e80fa2c40641278243f96b8398", 170944),
Common::ES_ESP,
Common::kPlatformDOS,
- ADGF_UNSTABLE | ADGF_CD,
+ ADGF_TESTING | ADGF_CD,
GUIO1(GUIO_NONE)
},
{
More information about the Scummvm-git-logs
mailing list