[Scummvm-git-logs] scummvm master -> 6e9d8f2af195cb9c42b447ad53bcff39ce9be362
neuromancer
noreply at scummvm.org
Sat Jun 4 07:58:11 UTC 2022
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6888d801ec HYPNO: add localization for the direction string in wet
e5779b3582 HYPNO: adjusted score and objectives positions in certain levels in wet
6e9d8f2af1 HYPNO: localized 'enter name' string in wet
Commit: 6888d801ececd7a1addae71a37da2bf7267219da
https://github.com/scummvm/scummvm/commit/6888d801ececd7a1addae71a37da2bf7267219da
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-04T09:47:19+02:00
Commit Message:
HYPNO: add localization for the direction string in wet
Changed paths:
engines/hypno/hypno.h
engines/hypno/wet/arcade.cpp
engines/hypno/wet/hard.cpp
engines/hypno/wet/wet.cpp
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index 8162d1f70eb..ba4e2833d52 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -323,6 +323,7 @@ public:
Common::String _scoreString;
Common::String _objString;
Common::String _targetString;
+ Common::String _directionString;
Filename _shootSound;
Filename _hitSound;
diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index 531e43150bc..55fce4f453e 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -957,7 +957,7 @@ void WetEngine::drawPlayer() {
uint8 segmentType = _segments[_segmentIdx].type;
if (segmentType == 0xc5 || segmentType == 0xc2 || segmentType == 0xcc)
if (_background->decoder->getCurFrame() % 3 > 0) // Avoid flashing too much
- drawString("block05.fgx", "CHOOSE DIRECTION", 113, 13, 80, kHypnoColorCyan);
+ drawString("block05.fgx", _directionString, 113, 13, 80, kHypnoColorCyan);
// TARGET ACQUIRED frame
uint32 c = kHypnoColorGreen; // green
diff --git a/engines/hypno/wet/hard.cpp b/engines/hypno/wet/hard.cpp
index 7231186dcf7..8871a6a4b9c 100644
--- a/engines/hypno/wet/hard.cpp
+++ b/engines/hypno/wet/hard.cpp
@@ -325,6 +325,15 @@ Common::String WetEngine::getLocalizedString(const Common::String name) {
default:
return "TARGET ACQUIRED";
}
+ } else if (name == "direction") {
+ switch (_language) {
+ case Common::FR_FRA:
+ return "DIRECTION ?";
+ case Common::ES_ESP:
+ return "ELIGE DIRECCION";
+ default:
+ return "CHOOSE DIRECTION";
+ }
} else
error("Invalid string name to localize: %s", name.c_str());
}
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 306b05797cc..b624b0ccb53 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -81,6 +81,7 @@ WetEngine::WetEngine(OSystem *syst, const ADGameDescription *gd) : HypnoEngine(s
_scoreString = getLocalizedString("score");
_objString = getLocalizedString("objectives");
_targetString = getLocalizedString("target");
+ _directionString = getLocalizedString("direction");
}
void WetEngine::loadAssets() {
Commit: e5779b35827bc9cbd98faee3ffece9ca703f3f17
https://github.com/scummvm/scummvm/commit/e5779b35827bc9cbd98faee3ffece9ca703f3f17
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-04T09:47:19+02:00
Commit Message:
HYPNO: adjusted score and objectives positions in certain levels in wet
Changed paths:
engines/hypno/wet/arcade.cpp
diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index 55fce4f453e..2ef8375c0d4 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -1054,8 +1054,8 @@ void WetEngine::drawHealth() {
r = Common::Rect(op.x - 2, op.y - 2, op.x + 74, op.y + 7);
_compositeSurface->frameRect(r, kHypnoColorGreen);
- scoreFormat = _scoreString + " %04d";
- moFormat = _objString + " %d/%d";
+ scoreFormat = _scoreString + " %04d";
+ moFormat = _objString + " %d/%d";
}
drawString("block05.fgx", Common::String::format(scoreFormat.c_str(), s), sp.x, sp.y, 72, c);
Commit: 6e9d8f2af195cb9c42b447ad53bcff39ce9be362
https://github.com/scummvm/scummvm/commit/6e9d8f2af195cb9c42b447ad53bcff39ce9be362
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-04T09:58:15+02:00
Commit Message:
HYPNO: localized 'enter name' string in wet
Changed paths:
engines/hypno/hypno.h
engines/hypno/wet/hard.cpp
engines/hypno/wet/wet.cpp
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index ba4e2833d52..6a92586aabb 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -324,6 +324,7 @@ public:
Common::String _objString;
Common::String _targetString;
Common::String _directionString;
+ Common::String _enterNameString;
Filename _shootSound;
Filename _hitSound;
diff --git a/engines/hypno/wet/hard.cpp b/engines/hypno/wet/hard.cpp
index 8871a6a4b9c..7e87c464ac0 100644
--- a/engines/hypno/wet/hard.cpp
+++ b/engines/hypno/wet/hard.cpp
@@ -142,7 +142,7 @@ void WetEngine::runMainMenu(Code *code) {
drawImage(*menu, 0, 0, false);
Graphics::Surface surName = overlay->getSubArea(subName);
drawImage(surName, subName.left, subName.top, false);
- drawString("scifi08.fgx", "ENTER NAME :", 48, 50, 100, c);
+ drawString("scifi08.fgx", _enterNameString, 48, 50, 100, c);
_name.clear();
bool cont = true;
while (!shouldQuit() && cont) {
@@ -168,7 +168,7 @@ void WetEngine::runMainMenu(Code *code) {
drawImage(*menu, 0, 0, false);
drawImage(surName, subName.left, subName.top, false);
- drawString("scifi08.fgx", "ENTER NAME :", 48, 50, 100, c);
+ drawString("scifi08.fgx", _enterNameString, 48, 50, 100, c);
drawString("scifi08.fgx", _name, 140, 50, 170, c);
break;
@@ -291,7 +291,16 @@ void WetEngine::showDemoScore() {
}
Common::String WetEngine::getLocalizedString(const Common::String name) {
- if (name == "health") {
+ if (name == "name") {
+ switch (_language) {
+ case Common::FR_FRA:
+ return "NOM :";
+ case Common::ES_ESP:
+ return "NOMBRE :";
+ default:
+ return "ENTER NAME :";
+ }
+ } else if (name == "health") {
switch (_language) {
case Common::FR_FRA:
return "ENERGIE";
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index b624b0ccb53..97872c546a4 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -82,6 +82,7 @@ WetEngine::WetEngine(OSystem *syst, const ADGameDescription *gd) : HypnoEngine(s
_objString = getLocalizedString("objectives");
_targetString = getLocalizedString("target");
_directionString = getLocalizedString("direction");
+ _enterNameString = getLocalizedString("name");
}
void WetEngine::loadAssets() {
More information about the Scummvm-git-logs
mailing list