From 8fa1bf8cbdd516c8120d5861c20f729a07c0812e Mon Sep 17 00:00:00 2001
From: Thanasis Antoniou
Date: Thu, 21 Mar 2019 10:07:59 +0200
Subject: BLADERUNNER: Support of localizations that use E as languageCode

Improved alignment of subtitles option for Russian version

The text for the subtitles option probably won't make sense though in Russian, someone will have to correct it to what it should be.
---
 engines/bladerunner/ui/kia_section_settings.cpp | 44 ++++++++++++++-----------
 1 file changed, 24 insertions(+), 20 deletions(-)

(limited to 'engines/bladerunner/ui')

diff --git a/engines/bladerunner/ui/kia_section_settings.cpp b/engines/bladerunner/ui/kia_section_settings.cpp
index 2d0ab1db85..a2908ad581 100644
--- a/engines/bladerunner/ui/kia_section_settings.cpp
+++ b/engines/bladerunner/ui/kia_section_settings.cpp
@@ -65,8 +65,13 @@ KIASectionSettings::KIASectionSettings(BladeRunnerEngine *vm)
 	_speechVolume         = new UISlider(_vm, sliderCallback, this, Common::Rect(180, 210, 460, 220), _vm->_mixer->kMaxMixerVolume, 0);
 #endif
 
-	_directorsCut         = new UICheckBox(_vm, checkBoxCallback, this, Common::Rect(180, 364, 270, 374), 0, false);
-	_subtitlesEnable      = new UICheckBox(_vm, checkBoxCallback, this, Common::Rect(311, 364, 380, 374), 0, false); // moved further to the right to avoid overlap with 'Designer's Cut' in some language versions (ESP)
+	if (_vm->_language == Common::RU_RUS) {
+		_directorsCut         = new UICheckBox(_vm, checkBoxCallback, this, Common::Rect(180, 364, 436, 374), 0, false); // expanded click-bounding box x-axis
+		_subtitlesEnable      = new UICheckBox(_vm, checkBoxCallback, this, Common::Rect(276, 376, 345, 386), 0, false); // moved to new line
+	} else {
+		_directorsCut         = new UICheckBox(_vm, checkBoxCallback, this, Common::Rect(180, 364, 270, 374), 0, false);
+		_subtitlesEnable      = new UICheckBox(_vm, checkBoxCallback, this, Common::Rect(311, 364, 380, 374), 0, false); // moved further to the right to avoid overlap with 'Designer's Cut' in some language versions (ESP)
+	}
 	_playerAgendaSelector = new UIImagePicker(_vm, 5);
 
 	_uiContainer->add(_musicVolume);
@@ -195,28 +200,27 @@ void KIASectionSettings::draw(Graphics::Surface &surface) {
 	if (_vm->_subtitles->isSystemActive()) {
 		// Allow this to be loading as an extra text item in the resource for text options
 		const char *subtitlesTranslation = "Subtitles";
-		if (_vm->_languageCode == "E") {
-			subtitlesTranslation = "Subtitles"; // EN_ANY
-		}
-		else if (_vm->_languageCode == "G") {
-			subtitlesTranslation = "Untertitel"; // DE_DEU
-		}
-		else if (_vm->_languageCode == "F") {
-			subtitlesTranslation = "Sous-titres"; // FR_FRA
-		}
-		else if (_vm->_languageCode == "I") {
-			subtitlesTranslation = "Sottotitoli"; // IT_ITA
-		}
-		else if (_vm->_languageCode == "R") {
-			subtitlesTranslation = "Subtitry";  // RU_RUS
-		}
-		else if (_vm->_languageCode == "S") {
-			subtitlesTranslation = "Subtitulos"; // ES_ESP
+		if (_vm->_language == Common::EN_ANY) {
+			subtitlesTranslation = "Subtitles";        // EN_ANY
+		} else if (_vm->_language == Common::DE_DEU) {
+			subtitlesTranslation = "Untertitel";       // DE_DEU
+		} else if (_vm->_language == Common::FR_FRA) {
+			subtitlesTranslation = "Sous-titres";      // FR_FRA
+		} else if (_vm->_language == Common::IT_ITA) {
+			subtitlesTranslation = "Sottotitoli";      // IT_ITA
+		} else if (_vm->_language == Common::RU_RUS) {
+			subtitlesTranslation = "Subtitry";         // RU_RUS
+		} else if (_vm->_language == Common::ES_ESP) {
+			subtitlesTranslation = "Subtitulos";       // ES_ESP
 		}
 
 		const char *textSubtitles  = strcmp(_vm->_textOptions->getText(42), "") == 0? subtitlesTranslation : _vm->_textOptions->getText(42); // +1 to the max of original index of textOptions which is 41
 
-		_vm->_mainFont->drawColor(textSubtitles, surface, 323, 365, 0x7751); // moved further to the right to avoid overlap with 'Designer's Cut' in some language versions (ESP)
+		if (_vm->_language == Common::RU_RUS) {
+			_vm->_mainFont->drawColor(textSubtitles, surface, 288, 376, 0x7751); // special case for Russian version, put the option in a new line to avoid overlap
+		} else {
+			_vm->_mainFont->drawColor(textSubtitles, surface, 323, 365, 0x7751); // moved further to the right to avoid overlap with 'Designer's Cut' in some language versions (ESP)
+		}
 	}
 
 	_playerAgendaSelector->drawTooltip(surface, _mouseX, _mouseY);
-- 
cgit v1.2.3