[Scummvm-cvs-logs] scummvm master -> 83c77021980dc931b24e69e95eca1a4969ef6543

[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:
d633a54526 AGOS: Added Russian Simon2 Talkie. Submitted by Dimouse
83c7702198 SKY: Added localized quit message for Russian translation


Commit: d633a54526481d01f464e794451fbd77317fcaf8
    https://github.com/scummvm/scummvm/commit/d633a54526481d01f464e794451fbd77317fcaf8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-16T23:39:38+02:00

Commit Message:
AGOS: Added Russian Simon2 Talkie. Submitted by Dimouse

Changed paths:
    engines/agos/detection_tables.h



diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h
index 793d408..90e5a84 100644
--- a/engines/agos/detection_tables.h
+++ b/engines/agos/detection_tables.h
@@ -2251,6 +2251,31 @@ static const AGOSGameDescription gameDescriptions[] = {
 		GF_TALKIE
 	},
 
+	// Simon the Sorcerer 2 - Russian DOS CD
+	{
+		{
+			"simon2",
+			"CD",
+
+			{
+	{ "gsptr30",		GAME_BASEFILE,	"e26d162e573587f4601b88701292212c", 58851},
+	{ "icon.dat",		GAME_ICONFILE,	"72096a62d36e6034ea9fecc13b2dbdab", 18089},
+	{ "simon2.gme",		GAME_GMEFILE,	"9c535d403966750ae98bdaf698375a38", 19687892},
+	{ "stripped.txt",	GAME_STRFILE,	"e229f84d46fa83f99b4a7115679f3fb6", 171},
+	{ "tbllist",		GAME_TBLFILE,	"2082f8d02075e590300478853a91ffd9", 513},
+	{ NULL, 0, NULL, 0}
+			},
+			Common::RU_RUS,
+			Common::kPlatformDOS,
+			ADGF_CD,
+			GUIO0()
+		},
+
+		GType_SIMON2,
+		GID_SIMON2,
+		GF_TALKIE
+	},
+
 	// Simon the Sorcerer 2 - Czech Windows CD
 	{
 		{


Commit: 83c77021980dc931b24e69e95eca1a4969ef6543
    https://github.com/scummvm/scummvm/commit/83c77021980dc931b24e69e95eca1a4969ef6543
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-16T23:39:38+02:00

Commit Message:
SKY: Added localized quit message for Russian translation

Changed paths:
    engines/sky/control.cpp
    engines/sky/control.h
    engines/sky/sky.cpp
    engines/sky/skydefs.h



diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index dfdd765..e79fa6e 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -1584,7 +1584,7 @@ void Control::showGameQuitMsg() {
 	free(textBuf2);
 }
 
-char Control::_quitTexts[16][35] = {
+char Control::_quitTexts[18][35] = {
 	"Game over player one",
 	"BE VIGILANT",
 	"Das Spiel ist aus.",
@@ -1600,7 +1600,9 @@ char Control::_quitTexts[16][35] = {
 	"Fim de jogo para o jogador um",
 	"BE VIGILANT",
 	"Game over player one",
-	"BE VIGILANT"
+	"BE VIGILANT",
+	"Irpa okohseha, irpok 1",
+	"JYD\x96 JDITELEH"
 };
 
 uint8 Control::_crossImg[594] = {
diff --git a/engines/sky/control.h b/engines/sky/control.h
index 44591f2..2089c74 100644
--- a/engines/sky/control.h
+++ b/engines/sky/control.h
@@ -292,7 +292,7 @@ private:
 
 	ControlStatus *_statusBar;
 
-	static char _quitTexts[16][35];
+	static char _quitTexts[18][35];
 	static uint8 _crossImg[594];
 };
 
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index 40b6959..710313b 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -336,6 +336,9 @@ Common::Error SkyEngine::init() {
 	case Common::EN_GRB:
 		_systemVars.language = SKY_ENGLISH;
 		break;
+	case Common::RU_RUS:
+		_systemVars.language = SKY_RUSSIAN;
+		break;
 	default:
 		_systemVars.language = SKY_ENGLISH;
 		break;
diff --git a/engines/sky/skydefs.h b/engines/sky/skydefs.h
index 167b7da..ed07a5e 100644
--- a/engines/sky/skydefs.h
+++ b/engines/sky/skydefs.h
@@ -45,6 +45,7 @@ namespace Sky {
 #define SKY_ITALIAN		5
 #define SKY_PORTUGUESE	6
 #define SKY_SPANISH		7
+#define SKY_RUSSIAN		8
 
 #define ST_COLLISION_BIT	5