[Scummvm-cvs-logs] scummvm master -> 960d14d79d63e7766e382bf940b49482c0746671

[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:
960d14d79d SAGA: Explicitely mark versions which require color shifting in interface. Fixes bug #7092


Commit: 960d14d79d63e7766e382bf940b49482c0746671
    https://github.com/scummvm/scummvm/commit/960d14d79d63e7766e382bf940b49482c0746671
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-28T00:54:05+02:00

Commit Message:
SAGA: Explicitely mark versions which require color shifting in interface. Fixes bug #7092

Changed paths:
    engines/saga/detection_tables.h
    engines/saga/interface.cpp
    engines/saga/saga.cpp
    engines/saga/saga.h



diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h
index f570c5e..91f3395 100644
--- a/engines/saga/detection_tables.h
+++ b/engines/saga/detection_tables.h
@@ -729,7 +729,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::DE_DEU,
 			Common::kPlatformDOS,
-			ADGF_NO_FLAGS,
+			GF_IHNM_COLOR_FIX,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_IHNM,
@@ -787,7 +787,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::ES_ESP,
 			Common::kPlatformDOS,
-			ADGF_NO_FLAGS,
+			GF_IHNM_COLOR_FIX,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_IHNM,
@@ -816,7 +816,7 @@ static const SAGAGameDescription gameDescriptions[] = {
 			},
 			Common::FR_FRA,
 			Common::kPlatformDOS,
-			ADGF_NO_FLAGS,
+			GF_IHNM_COLOR_FIX,
 			GUIO1(GUIO_NOASPECT)
 		},
 		GID_IHNM,
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index b580e21..cb09d53 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -1879,7 +1879,7 @@ void Interface::drawStatusBar() {
 	// 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;
+	int offset = (_vm->getFeatures() & GF_IHNM_COLOR_FIX) ? 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 77a21e7..649888e 100644
--- a/engines/saga/saga.cpp
+++ b/engines/saga/saga.cpp
@@ -582,7 +582,7 @@ ColorId SagaEngine::KnownColor2ColorId(KnownColor knownColor) {
 		// 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;
+		int offset = (getFeatures() & GF_IHNM_COLOR_FIX) ? 1 : 0;
 
 		switch (knownColor) {
 		case(kKnownColorTransparent):
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 9c7b2f5..06cb411 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -139,7 +139,8 @@ enum GameFeatures {
 	GF_ITE_FLOPPY        = 1 << 0,
 	GF_ITE_DOS_DEMO      = 1 << 1,
 	GF_EXTRA_ITE_CREDITS = 1 << 2,
-	GF_8BIT_UNSIGNED_PCM = 1 << 3
+	GF_8BIT_UNSIGNED_PCM = 1 << 3,
+	GF_IHNM_COLOR_FIX    = 1 << 4
 };
 
 enum VerbTypeIds {