Fix for bug #1848016 - "IHNM: Wrong Subtitles Color (Spanish)". The colors of the default palette in the Spanish version of the game are shifted by 1.

svn-id: r29828

2 files changed, 20 insertions, 19 deletions

diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index c3e926ad95..fce8807681 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -964,7 +964,7 @@ void Interface::drawOption() {
 		if (_vm->getGameType() == GType_ITE)
 			bgColor = kITEColorDarkGrey0C;
 		else
-			bgColor = kIHNMColorBlack;
+			bgColor = _vm->KnownColor2ColorId(kKnownColorBlack);
 		fgColor = kITEColorBrightWhite;
 
 		idx = j + _optionSaveFileTop;
@@ -1811,6 +1811,9 @@ void Interface::drawStatusBar() {
 	Point textPoint;
 	int stringWidth;
 	int color;
+	// The default colors in the Spanish version of IHNM are shifted by one
+	// Fixes bug #1848016 - "IHNM: Wrong Subtitles Color (Spanish)"
+	int offset = (_vm->getGameId() == GID_IHNM_CD_ES) ? 1 : 0;
 
 	// Disable the status text in IHNM when the chapter is 8
 	if (_vm->getGameType() == GType_IHNM && _vm->_scene->currentChapterNumber() == 8)
@@ -1828,12 +1831,12 @@ void Interface::drawStatusBar() {
 	rect.right = rect.left + _vm->getDisplayWidth();
 	rect.bottom = rect.top + _vm->getDisplayInfo().statusHeight;
 
-	backBuffer->drawRect(rect, _vm->getDisplayInfo().statusBGColor);
+	backBuffer->drawRect(rect, _vm->getDisplayInfo().statusBGColor - offset);
 
 	stringWidth = _vm->_font->getStringWidth(kKnownFontSmall, _statusText, 0, kFontNormal);
 
 	if (_statusOnceColor == -1)
-		color = _vm->getDisplayInfo().statusTextColor;
+		color = _vm->getDisplayInfo().statusTextColor - offset;
 	else
 		color = _statusOnceColor;
 
@@ -2061,7 +2064,7 @@ void Interface::drawInventory(Surface *backBuffer) {
 		if (_vm->getGameType() == GType_ITE)
 			backBuffer->drawRect(rect, kITEColorDarkGrey);
 		else
-			backBuffer->drawRect(rect, kIHNMColorBlack);
+			backBuffer->drawRect(rect, _vm->KnownColor2ColorId(kKnownColorBlack));
 
 		if (ci < _inventoryCount) {
 			obj = _vm->_actor->getObj(_inventory[ci]);
@@ -2107,10 +2110,8 @@ void Interface::drawButtonBox(Surface *ds, const Rect& rect, ButtonKind kind, bo
 				odl = kITEColorLightBlue94;
 				solidColor = down ? kITEColorBlue : kITEColorDarkGrey0C;
 			} else {
-				cornerColor = frameColor = fillColor = kIHNMColorBlack;
-				our = kIHNMColorBlack;
-				odl = kIHNMColorBlack;
-				solidColor = kIHNMColorBlack;
+				cornerColor = frameColor = fillColor = _vm->KnownColor2ColorId(kKnownColorBlack);
+				our = odl = solidColor = _vm->KnownColor2ColorId(kKnownColorBlack);
 			}
 			iur = 0x97;
 			idl = 0x95;
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp
index 2723551d94..495a0c6332 100644
--- a/engines/saga/saga.cpp
+++ b/engines/saga/saga.cpp
@@ -446,7 +446,6 @@ ColorId SagaEngine::KnownColor2ColorId(KnownColor knownColor) {
 		case(kKnownColorTransparent):
 			colorId = kITEColorTransBlack;
 			break;
-
 		case (kKnownColorBrightWhite):
 			colorId = kITEColorBrightWhite;
 			break;
@@ -456,7 +455,6 @@ ColorId SagaEngine::KnownColor2ColorId(KnownColor knownColor) {
 		case (kKnownColorBlack):
 			colorId = kITEColorBlack;
 			break;
-
 		case (kKnownColorSubtitleTextColor):
 			colorId = (ColorId)255;
 			break;
@@ -474,29 +472,31 @@ ColorId SagaEngine::KnownColor2ColorId(KnownColor knownColor) {
 			error("SagaEngine::KnownColor2ColorId unknown color %i", knownColor);
 		}
 	} else if (getGameType() == GType_IHNM) {
+		// The default colors in the Spanish version of IHNM are shifted by one
+		// Fixes bug #1848016 - "IHNM: Wrong Subtitles Color (Spanish)"
+		int offset = (getGameId() == GID_IHNM_CD_ES) ? 1 : 0;
+
 		switch (knownColor) {
 		case(kKnownColorTransparent):
-			colorId = kITEColorTransBlack;
+			colorId = (ColorId)(249 - offset);
 			break;
-
 		case (kKnownColorBrightWhite):
-			colorId = kITEColorBrightWhite;
+			colorId = (ColorId)(251 - offset);
 			break;
 		case (kKnownColorWhite):
-			colorId = kITEColorBrightWhite;
+			colorId = (ColorId)(251 - offset);
 			break;
 		case (kKnownColorBlack):
-			colorId = kIHNMColorBlack;
+			colorId = (ColorId)(249 - offset);
 			break;
-
 		case (kKnownColorVerbText):
-			colorId = (ColorId)253;
+			colorId = (ColorId)(253 - offset);
 			break;
 		case (kKnownColorVerbTextShadow):
-			colorId = (ColorId)15;
+			colorId = (ColorId)(15 - offset);
 			break;
 		case (kKnownColorVerbTextActive):
-			colorId = (ColorId)252;
+			colorId = (ColorId)(252 - offset);
 			break;
 
 		default: