[Scummvm-cvs-logs] scummvm master -> 44a49dbec5d7a472edcd662b77c041baa22872a0

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
44a49dbec5 SKY: Proper support for Russian BASS


Commit: 44a49dbec5d7a472edcd662b77c041baa22872a0
    https://github.com/scummvm/scummvm/commit/44a49dbec5d7a472edcd662b77c041baa22872a0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-17T12:44:18+02:00

Commit Message:
SKY: Proper support for Russian BASS

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



diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index e79fa6e..07be1c6 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -1562,8 +1562,13 @@ void Control::showGameQuitMsg() {
 
 	screenData = _skyScreen->giveCurrent();
 
-	_skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 0], textBuf1, true, 320, 255);
-	_skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 1], textBuf2, true, 320, 255);
+	if (Common::parseLanguage(ConfMan.get("language")) == Common::RU_RUS)         {
+		_skyText->displayText(_quitTexts[8 * 2 + 0], textBuf1, true, 320, 255);
+		_skyText->displayText(_quitTexts[8 * 2 + 1], textBuf2, true, 320, 255);
+	} else {
+		_skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 0], textBuf1, true, 320, 255);
+		_skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 1], textBuf2, true, 320, 255);
+	}
 	uint8 *curLine1 = textBuf1 + sizeof(DataFileHeader);
 	uint8 *curLine2 = textBuf2 + sizeof(DataFileHeader);
 	uint8 *targetLine = screenData + GAME_SCREEN_WIDTH * 80;
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index 710313b..40b6959 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -336,9 +336,6 @@ 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;