[Scummvm-cvs-logs] scummvm branch-1-8 -> ed418d1e48b21208c64551b7cb4cc774986de698

[eriktorbjorn]

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:
ed418d1e48 SAGA: Fix interface colors in French and German versions of IHNM


Commit: ed418d1e48b21208c64551b7cb4cc774986de698
    https://github.com/scummvm/scummvm/commit/ed418d1e48b21208c64551b7cb4cc774986de698
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-03-16T06:30:41+01:00

Commit Message:
SAGA: Fix interface colors in French and German versions of IHNM

The same fix that had already been applied to the Spanish version
also applies to the French and German versions. (Judging by the
detection entries, there aren't any alternative versions so the
ones I got from GOG should be representative.)

The palettes aren't quite identical to the Spanish one, but I
think the remaining difference is for the spiritual barometer, so
the special case for that remains Spanish-only.

Changed paths:
    NEWS
    engines/saga/interface.cpp
    engines/saga/saga.cpp



diff --git a/NEWS b/NEWS
index 9853d61..db0f774 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,10 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fixed lock-up during ending sequence.
    - Improved internal game controls.
 
+ SAGA:
+   - Fixed user interface colors in the French and German versions of I Have No
+     Mouth and I Must Scream.
+
  SCI:
    - Make cursor workarounds work properly on OpenPandora (and other devices, that
      support touch screen and analog sticks/mouse at the same time)
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index cb42ac0..ad940aa 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -1862,8 +1862,10 @@ void Interface::drawStatusBar() {
 	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->getLanguage() == Common::ES_ESP) ? 1 : 0;
+	// Fixes bug #1848016 - "IHNM: Wrong Subtitles Color (Spanish)". This
+	// also applies to the German and French versions (bug #7064 - "IHNM:
+	// text mistake in german version").
+	int offset = (_vm->getLanguage() == Common::ES_ESP || _vm->getLanguage() == Common::DE_DEU || _vm->getLanguage() == Common::FR_FRA) ? 1 : 0;
 
 	// Disable the status text in IHNM when the chapter is 8
 	if (_vm->getGameId() == GID_IHNM && _vm->_scene->currentChapterNumber() == 8)
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp
index 532b59d..77a21e7 100644
--- a/engines/saga/saga.cpp
+++ b/engines/saga/saga.cpp
@@ -578,9 +578,11 @@ ColorId SagaEngine::KnownColor2ColorId(KnownColor knownColor) {
 		}
 #ifdef ENABLE_IHNM
 	} else if (getGameId() == GID_IHNM) {
-		// The default colors in the Spanish version of IHNM are shifted by one
-		// Fixes bug #1848016 - "IHNM: Wrong Subtitles Color (Spanish)"
-		int offset = (getLanguage() == Common::ES_ESP) ? 1 : 0;
+		// The default colors in the Spanish, version of IHNM are shifted by one
+		// Fixes bug #1848016 - "IHNM: Wrong Subtitles Color (Spanish)". This
+		// also applies to the German and French versions (bug #7064 - "IHNM:
+		// text mistake in german version").
+		int offset = (getLanguage() == Common::ES_ESP || getLanguage() == Common::DE_DEU || getLanguage() == Common::FR_FRA) ? 1 : 0;
 
 		switch (knownColor) {
 		case(kKnownColorTransparent):