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

[sev-]

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:
b2f11dd8ba PRINCE: correct Russian translation for "walk to" action
ae9a76d527 PRINCE: support amateur Russian localization from "Russian project"


Commit: b2f11dd8bae71a3e116898607ca3ed39a573a7e9
    https://github.com/scummvm/scummvm/commit/b2f11dd8bae71a3e116898607ca3ed39a573a7e9
Author: Денис Телюх (iliotropion2006 at ya.ru)
Date: 2020-10-29T19:23:49+01:00

Commit Message:
PRINCE: correct Russian translation for "walk to" action

Changed paths:
    engines/prince/option_text.h


diff --git a/engines/prince/option_text.h b/engines/prince/option_text.h
index cc97f042af..dafe74d07d 100644
--- a/engines/prince/option_text.h
+++ b/engines/prince/option_text.h
@@ -92,7 +92,7 @@ const char *invOptionsTextRU[] = {
 };
 
 const char *optionsTextRU[] = {
-	"Gjlevfnm",
+	"Gjljqnb",
 	"Jcvjnhtnm",
 	"Dpznm ",
 	"Bcgjkmp.",


Commit: ae9a76d5279018cb6d3a9ba7d40cd5e7b6b86ba3
    https://github.com/scummvm/scummvm/commit/ae9a76d5279018cb6d3a9ba7d40cd5e7b6b86ba3
Author: Denis Telyukh (telyukh.denis at gmail.com)
Date: 2020-10-29T19:23:49+01:00

Commit Message:
PRINCE: support amateur Russian localization from "Russian project"

Changed paths:
    engines/prince/detection.cpp
    engines/prince/detection.h
    engines/prince/inventory.cpp
    engines/prince/option_text.h


diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index a2866a41a5..a5b8758b4a 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -79,6 +79,18 @@ static const PrinceGameDescription gameDescriptions[] = {
 		},
 		kPrinceDataDE
 	},
+    {
+        {
+            "prince",
+            "",
+            AD_ENTRY1s("databank.ptc", "eb702d16e88c8c41f963d449287c8023", 3730152),
+            Common::RU_RUS,
+            Common::kPlatformWindows,
+            GF_RUSPROJEDITION | ADGF_USEEXTRAASTITLE | ADGF_DROPPLATFORM,
+            GUIO1(GUIO_NONE)
+        },
+        kPrinceDataDE
+    },
 	{
 		{
 			"prince",
diff --git a/engines/prince/detection.h b/engines/prince/detection.h
index 6e5f8ced8f..79635ce4dd 100644
--- a/engines/prince/detection.h
+++ b/engines/prince/detection.h
@@ -34,9 +34,10 @@ enum PrinceGameType {
 };
 
 enum {
-	GF_TRANSLATED = 1 << 0,
-	GF_EXTRACTED  = 1 << 1,
-	GF_NOVOICES   = 1 << 2
+    GF_TRANSLATED      = 1 << 0,
+    GF_EXTRACTED       = 1 << 1,
+    GF_NOVOICES        = 1 << 2,
+    GF_RUSPROJEDITION  = 1 << 3
 };
 
 struct PrinceGameDescription {
diff --git a/engines/prince/inventory.cpp b/engines/prince/inventory.cpp
index 53b62a871d..b363126e1f 100644
--- a/engines/prince/inventory.cpp
+++ b/engines/prince/inventory.cpp
@@ -531,8 +531,12 @@ void PrinceEngine::checkOptions() {
 				optText = optionsTextEN[i];
 				break;
 			case Common::RU_RUS:
-				optText = optionsTextRU[i];
-				break;
+                if (getFeatures() & GF_RUSPROJEDITION) {
+                    optText = optionsTextRU2[i];
+                } else {
+                    optText = optionsTextRU[i];
+                }
+                break;
 			default:
 				break;
 			};
@@ -583,8 +587,12 @@ void PrinceEngine::checkInvOptions() {
 				invText = invOptionsTextEN[i];
 				break;
 			case Common::RU_RUS:
-				invText = invOptionsTextRU[i];
-				break;
+                if (getFeatures() & GF_RUSPROJEDITION) {
+                    invText = invOptionsTextRU2[i];
+                } else {
+                    invText = invOptionsTextRU[i];
+                }
+                break;
 			default:
 				error("Unknown game language %d", getLanguage());
 				break;
diff --git a/engines/prince/option_text.h b/engines/prince/option_text.h
index dafe74d07d..8e1b6bc8e7 100644
--- a/engines/prince/option_text.h
+++ b/engines/prince/option_text.h
@@ -101,4 +101,23 @@ const char *optionsTextRU[] = {
 	"Ujdjhbnm  "
 };
 
+// RU localization from "Russian Project"
+const char *invOptionsTextRU2[] = {
+	"n""\x91""\x8c""\x8e""\x92""\x90""\x85""\x92""\x9c",
+	"h""\x91""\x8f""\x8e""\x8b""\x9c""\x87"".",
+	"n""\x92""\x8a""\x90""\x9b""\x92""\x9c""/r""\x8e""\x8b""\x8a""\x80""\x92""\x9c",
+	"g""\x80""\x8a""\x90""\x9b""\x92""\x9c""/r""\x9f""\x8d""\x93""\x92""\x9c",
+	"d""\x80""\x92""\x9c"
+};
+
+const char *optionsTextRU2[] = {
+	"o""\x8e""\x84""\x8e""\x89""\x92""\x88",
+	"n""\x91""\x8c""\x8e""\x92""\x90""\x85""\x92""\x9c",
+	"b""\x87""\x9f""\x92""\x9c",
+	"h""\x91""\x8f""\x8e""\x8b""\x9c""\x87"".",
+	"n""\x92""\x8a""\x90""\x9b""\x92""\x9c""/r""\x8e""\x8b""\x8a""\x80""\x92""\x9c",
+	"g""\x80""\x8a""\x90""\x9b""\x92""\x9c""/r""\x9f""\x8d""\x93""\x92""\x9c",
+	"c""\x8e""\x82""\x8e""\x90""\x88""\x92""\x9c"
+};
+
 } // End of namespace Prince