[Scummvm-git-logs] scummvm master -> efcb3a49211f849ad0c9f29522d8ee5ec440dcb6

[antoniou79]

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:
58b7b58bb8 BLADERUNNER: Cleaner output for debugger cmdList
efcb3a4921 BLADERUNNER: Proper Subtitles option translation for RUS


Commit: 58b7b58bb81bd9a7ef78f7433df6fecb9b1faabe
    https://github.com/scummvm/scummvm/commit/58b7b58bb81bd9a7ef78f7433df6fecb9b1faabe
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-04-21T18:29:57+03:00

Commit Message:
BLADERUNNER: Cleaner output for debugger cmdList

Changed paths:
    engines/bladerunner/debugger.cpp


diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index 03bdd4d..0913e5e 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -1096,7 +1096,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 			SceneObjects::SceneObject *sceneObject = &_vm->_sceneObjects->_sceneObjects[_vm->_sceneObjects->_sceneObjectsSortedByDistance[i]];
 
 			if (sceneObject->type == kSceneObjectTypeActor) {
-				debugPrintf("%02d. %s (CLK: %s, TRG: %s, PRS: %s, OBS: %s, MVG: %s), Goal: %d, Pos(%02.2f,%02.2f,%02.2f)\n",
+				debugPrintf("%02d. %s (Clk: %s, Trg: %s, Prs: %s, Obs: %s, Mvg: %s), Goal: %d, Pos(%02.2f,%02.2f,%02.2f)\n",
 				             count, _vm->_textActorNames->getText(sceneObject->id - kSceneObjectOffsetActors),
 				             sceneObject->isClickable? "T" : "F",
 				             sceneObject->isTarget?    "T" : "F",
@@ -1125,7 +1125,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 				debugPrintf("%02d. Unknown object type\n", count);
 				++count;
 			} else if (sceneObject->type == kSceneObjectTypeObject) {
-				debugPrintf("%02d. %s (CLK: %s, TRG: %s, PRS: %s, OBS: %s, MVG: %s), Pos(%02.2f,%02.2f,%02.2f), Bbox:(%02.2f,%02.2f,%02.2f)~(%02.2f,%02.2f,%02.2f)\n",
+				debugPrintf("%02d. %s (Clk: %s, Trg: %s, Prs: %s, Obs: %s, Mvg: %s), Pos(%02.2f,%02.2f,%02.2f)\n     Bbox(%02.2f,%02.2f,%02.2f) ~ (%02.2f,%02.2f,%02.2f)\n",
 				             count, _vm->_scene->objectGetName(sceneObject->id - kSceneObjectOffsetObjects).c_str(),
 				             sceneObject->isClickable? "T" : "F",
 				             sceneObject->isTarget?    "T" : "F",
@@ -1151,7 +1151,7 @@ bool Debugger::cmdList(int argc, const char **argv) {
 				Vector3 pos = _vm->_view->calculateScreenPosition(0.5 * (a + b));
 				char itemText[40];
 				sprintf(itemText, "item %i", sceneObject->id - kSceneObjectOffsetItems);
-				debugPrintf("%02d. %s (CLK: %s, TRG: %s, PRS: %s, OBS: %s, MVG: %s), Pos(%02.2f,%02.2f,%02.2f), Bbox:(%02.2f,%02.2f,%02.2f)~(%02.2f,%02.2f,%02.2f)\n",
+				debugPrintf("%02d. %s (Clk: %s, Trg: %s, Prs: %s, Obs: %s, Mvg: %s), Pos(%02.2f,%02.2f,%02.2f)\n    Bbox(%02.2f,%02.2f,%02.2f) ~ (%02.2f,%02.2f,%02.2f)\n",
 				             count, itemText,
 				             sceneObject->isClickable? "T" : "F",
 				             sceneObject->isTarget?    "T" : "F",


Commit: efcb3a49211f849ad0c9f29522d8ee5ec440dcb6
    https://github.com/scummvm/scummvm/commit/efcb3a49211f849ad0c9f29522d8ee5ec440dcb6
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-04-21T18:29:57+03:00

Commit Message:
BLADERUNNER: Proper Subtitles option translation for RUS

Changed paths:
    engines/bladerunner/ui/kia_section_settings.cpp


diff --git a/engines/bladerunner/ui/kia_section_settings.cpp b/engines/bladerunner/ui/kia_section_settings.cpp
index 5492fbe..ae2f32e 100644
--- a/engines/bladerunner/ui/kia_section_settings.cpp
+++ b/engines/bladerunner/ui/kia_section_settings.cpp
@@ -209,7 +209,10 @@ void KIASectionSettings::draw(Graphics::Surface &surface) {
 		} else if (_vm->_language == Common::IT_ITA) {
 			subtitlesTranslation = "Sottotitoli";      // IT_ITA
 		} else if (_vm->_language == Common::RU_RUS) {
-			subtitlesTranslation = "Subtitry";         // RU_RUS
+			// The supported Russian version is using its own KIA6PT.FON
+			// where it has replaced the mapping of Latin characters to Russian characters
+			// So the character string here does not make sense, but it will appear correctly
+			subtitlesTranslation = "CE,NBNHS";         // RU_RUS "Subtitry"
 		} else if (_vm->_language == Common::ES_ESP) {
 			subtitlesTranslation = "Subtitulos";       // ES_ESP
 		}