[Scummvm-cvs-logs] scummvm master -> 8cd50910685103e0ff59fe4634536b5ac4e67c1d
sev-
sev at scummvm.org
Wed Jan 13 00:01:42 CET 2016
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0c091f4faa LURE: Add support for Russian version
2d45896977 MOHAWK: Added detection for Russian Riven
d021cc3448 SCUMM: Added detection for Russian Zak
8cd5091068 NEVERHOOD: Fix another crash in Russian version
Commit: 0c091f4faabc073785a8ffe34b92855a665b4dd0
https://github.com/scummvm/scummvm/commit/0c091f4faabc073785a8ffe34b92855a665b4dd0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-01-12T23:53:14+01:00
Commit Message:
LURE: Add support for Russian version
Changed paths:
engines/lure/detection.cpp
engines/lure/game.cpp
engines/lure/lure.h
engines/lure/menu.cpp
engines/lure/surface.cpp
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index a87fcf6..eff699b 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -46,6 +46,7 @@ LureLanguage LureEngine::getLureLanguage() const {
case Common::FR_FRA: return LANG_FR_FRA;
case Common::DE_DEU: return LANG_DE_DEU;
case Common::ES_ESP: return LANG_ES_ESP;
+ case Common::RU_RUS: return LANG_RU_RUS;
case Common::EN_ANY: return LANG_EN_ANY;
case Common::UNK_LANG: return LANG_UNKNOWN;
default:
@@ -168,6 +169,21 @@ static const LureGameDescription gameDescriptions[] = {
GF_FLOPPY,
},
+ // Russian OG Edition
+ {
+ {
+ "lure",
+ "",
+ AD_ENTRY1("disk1.vga", "04cdcaa9f0cadca492f7aff0c8adfe06"),
+ Common::RU_RUS,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO0()
+ },
+ GF_FLOPPY,
+ },
+
+
{ AD_TABLE_END_MARKER, 0 }
};
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp
index efd33b6..38ca0ba 100644
--- a/engines/lure/game.cpp
+++ b/engines/lure/game.cpp
@@ -1000,6 +1000,7 @@ bool Game::getYN() {
if (l == Common::FR_FRA) y = Common::KEYCODE_o;
else if ((l == Common::DE_DEU) || (l == Common::NL_NLD)) y = Common::KEYCODE_j;
else if ((l == Common::ES_ESP) || (l == Common::IT_ITA)) y = Common::KEYCODE_s;
+ else if (l == Common::RU_RUS) y = Common::KEYCODE_l;
bool vKbdFlag = g_system->hasFeature(OSystem::kFeatureVirtualKeyboard);
if (!vKbdFlag)
@@ -1018,7 +1019,12 @@ bool Game::getYN() {
while (events.pollEvent()) {
if (events.event().type == Common::EVENT_KEYDOWN) {
Common::KeyCode key = events.event().kbd.keycode;
- if ((key == y) || (key == Common::KEYCODE_n) ||
+ if (l == Common::RU_RUS) {
+ if ((key == y) || (key == Common::KEYCODE_y) || (key == Common::KEYCODE_ESCAPE)) {
+ breakFlag = true;
+ result = key == y;
+ }
+ } else if ((key == y) || (key == Common::KEYCODE_n) ||
(key == Common::KEYCODE_ESCAPE)) {
breakFlag = true;
result = key == y;
diff --git a/engines/lure/lure.h b/engines/lure/lure.h
index 8a82993..b6eb912 100644
--- a/engines/lure/lure.h
+++ b/engines/lure/lure.h
@@ -58,6 +58,7 @@ enum LureLanguage {
LANG_DE_DEU = 7,
LANG_ES_ESP = 17,
LANG_EN_ANY = 3,
+ LANG_RU_RUS = 3, // English data has been overridden
LANG_UNKNOWN = -1
};
diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp
index 8867e8a..8672f5f 100644
--- a/engines/lure/menu.cpp
+++ b/engines/lure/menu.cpp
@@ -75,6 +75,7 @@ const MenuRecordLanguage menuList[] = {
{Common::FR_FRA, {{40, 90, 3, 7}, {120, 195, 13, 11}, {232, 273, 23, 13}}},
{Common::DE_DEU, {{44, 95, 1, 11}, {135, 178, 8, 23}, {232, 273, 22, 15}}},
{Common::ES_ESP, {{40, 90, 3, 8}, {120, 195, 11, 13}, {208, 281, 17, 18}}},
+ {Common::RU_RUS, {{40, 87, 3, 7}, {127, 179, 13, 12}, {224, 281, 27, 10}}},
{Common::UNK_LANG, {{0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}}
};
@@ -378,9 +379,13 @@ uint16 PopupMenu::ShowItems(Action contextAction, uint16 roomNumber) {
++numItems;
}
- if (numItems == 0)
+ if (numItems == 0) {
// No items, so add a 'nothing' to the statusLine
- strcat(room.statusLine(), "(nothing)");
+ if (LureEngine::getReference().getLanguage() == Common::RU_RUS)
+ strcat(room.statusLine(), "(ybxtuj ytn)");
+ else
+ strcat(room.statusLine(), "(nothing)");
+ }
room.update();
screen.update();
diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp
index 17ac178..7cbef0f 100644
--- a/engines/lure/surface.cpp
+++ b/engines/lure/surface.cpp
@@ -1262,6 +1262,7 @@ static const ItemDesc copyProtectElements[] = {
{Common::NL_NLD, 57, 40, 208, 40, WORDING_HEADER, 32},
{Common::ES_ESP, 57, 40, 208, 40, WORDING_HEADER, 32},
{Common::IT_ITA, 57, 40, 208, 40, WORDING_HEADER, 32},
+ {Common::RU_RUS, 57, 40, 208, 40, WORDING_HEADER, 32},
{Common::UNK_LANG, 138, 168, 16, 8, NUMBER_HEADER, 32},
{Common::UNK_LANG, 145, 168, 16, 8, NUMBER_HEADER, 32},
Commit: 2d45896977a62fdf631d344c43834d69e42754c5
https://github.com/scummvm/scummvm/commit/2d45896977a62fdf631d344c43834d69e42754c5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-01-12T23:53:14+01:00
Commit Message:
MOHAWK: Added detection for Russian Riven
Changed paths:
engines/mohawk/detection_tables.h
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 6bb836b..69b2d20 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -330,6 +330,23 @@ static const MohawkGameDescription gameDescriptions[] = {
},
// Riven: The Sequel to Myst
+ // Version 1.1 (5CD) - Russian, Fargus
+ {
+ {
+ "riven",
+ "",
+ AD_ENTRY1("a_Data.MHK", "59bd2e3ccbae2f1faa1b23a18dc316eb"),
+ Common::RU_RUS,
+ Common::kPlatformWindows,
+ ADGF_UNSTABLE,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_RIVEN,
+ 0,
+ 0,
+ },
+
+ // Riven: The Sequel to Myst
// Version 1.? (DVD, From "Myst 10th Anniversary Edition")
// From Clone2727
{
@@ -402,6 +419,23 @@ static const MohawkGameDescription gameDescriptions[] = {
},
// Riven: The Sequel to Myst
+ // Version 1.1 (DVD), Russan, Fargus
+ {
+ {
+ "riven",
+ "DVD",
+ AD_ENTRY1("a_Data.MHK", "b5f40e6e6b843bf3abea291faa0911f4"),
+ Common::RU_RUS,
+ Common::kPlatformWindows,
+ ADGF_UNSTABLE,
+ GUIO1(GUIO_NOASPECT)
+ },
+ GType_RIVEN,
+ GF_DVD,
+ 0,
+ },
+
+ // Riven: The Sequel to Myst
// Version ? (Demo, From "Prince of Persia Collector's Edition")
// From Clone2727
{
Commit: d021cc34486d7d724caca75592b1d1070f24069b
https://github.com/scummvm/scummvm/commit/d021cc34486d7d724caca75592b1d1070f24069b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-01-12T23:53:14+01:00
Commit Message:
SCUMM: Added detection for Russian Zak
Changed paths:
devtools/scumm-md5.txt
engines/scumm/scumm-md5.h
diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 75246b3..b0d6725 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -108,6 +108,7 @@ zak Zak McKracken and the Alien Mindbenders
d06fbe28818fef7bfc45c2cdf0c0849d -1 de DOS V2 V2 from 5.25\" floppies Nicolas Sauzède, Andrea Petrucci
1900e501a52fbf55bde6e4196f6d2aa6 -1 it DOS V2 V2 - Andrea Petrucci
75ba23fff4fd63fa446c02864f2a5a4b -1 it DOS V2 V2 alt? Antti Leimi, Andrea Petrucci
+ a77d0efbe786ea7f490c2021dbfa3f2f -1 ru DOS V2 V2 - sev
2d4536a56e01da4b02eb021e7770afa2 7520 en FM-TOWNS FM-TOWNS - -
1ca86e2cf9aaa2068738a1e5ba477e60 -1 jp FM-TOWNS FM-TOWNS - - Andrea Petrucci
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index fdb5991..e15ac8a 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Sun Jan 10 01:56:24 2016
+ This file was generated by the md5table tool on Tue Jan 12 22:52:42 2016
DO NOT EDIT MANUALLY!
*/
@@ -481,6 +481,7 @@ static const MD5Table md5table[] = {
{ "a5c5388da9bf0e6662fdca8813a79d13", "farm", "", "", 86962, Common::EN_ANY, Common::kPlatformWindows },
{ "a654fb60c3b67d6317a7894ffd9f25c5", "pajama3", "", "Demo", -1, Common::EN_USA, Common::kPlatformUnknown },
{ "a71014c53a6d18c66ef2ea0ee42328e9", "PuttTime", "HE 99", "Mini Game", 18458, Common::NL_NLD, Common::kPlatformWindows },
+ { "a77d0efbe786ea7f490c2021dbfa3f2f", "zak", "V2", "V2", -1, Common::RU_RUS, Common::kPlatformDOS },
{ "a7cacad9c40c4dc9e1812abf6c8af9d5", "puttcircus", "", "Demo", -1, Common::EN_USA, Common::kPlatformUnknown },
{ "a85856675429fe88051744f755b72f93", "farm", "HE 73", "", -1, Common::EN_ANY, Common::kPlatformWindows },
{ "a86f9c49355579c30d4a55b477c0d869", "baseball2001", "", "", -1, Common::EN_ANY, Common::kPlatformUnknown },
Commit: 8cd50910685103e0ff59fe4634536b5ac4e67c1d
https://github.com/scummvm/scummvm/commit/8cd50910685103e0ff59fe4634536b5ac4e67c1d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-01-12T23:58:15+01:00
Commit Message:
NEVERHOOD: Fix another crash in Russian version
Changed paths:
engines/neverhood/resourceman.cpp
diff --git a/engines/neverhood/resourceman.cpp b/engines/neverhood/resourceman.cpp
index 81a9d8a..7320cfa 100644
--- a/engines/neverhood/resourceman.cpp
+++ b/engines/neverhood/resourceman.cpp
@@ -120,6 +120,7 @@ static const EntrySizeFix entrySizeFixes[] = {
// Fixes for the Russian "Fargus" version
{ 0x041137051, 758264, 29037, 49590, 49591 }, // "Options" menu header text
{ 0x0c10b2015, 787304, 4414, 15848, 15853 }, // Text on option buttons
+ { 0x006802920, 1076824, 1010, 5642, 1546 }, // Crash in front of the Aqua House
//
{ 0, 0, 0, 0, 0 }
};
More information about the Scummvm-git-logs
mailing list