[Scummvm-cvs-logs] scummvm master -> b37ebb61eb24eb861c9853bd26a092d686da209b

[csnover]

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:
b37ebb61eb Revert "SCI32: Add blackline option to KQ7 2.00b DOS"


Commit: b37ebb61eb24eb861c9853bd26a092d686da209b
    https://github.com/scummvm/scummvm/commit/b37ebb61eb24eb861c9853bd26a092d686da209b
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-07-11T14:27:57-05:00

Commit Message:
Revert "SCI32: Add blackline option to KQ7 2.00b DOS"

This reverts commit 1ab87e3f8f24b19f5b9257dd9e6c5118b1a00f1d.

VMD and DUK are the formats that get blacklined, not Robot.

Changed paths:
    engines/sci/detection_tables.h



diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 598f0d9..f205609 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -1754,11 +1754,6 @@ static const struct ADGameDescription SciGameDescriptions[] = {
                             GAMEOPTION_PREFER_DIGITAL_SFX, \
                             GAMEOPTION_ORIGINAL_SAVELOAD, \
                             GAMEOPTION_FB01_MIDI)
-#define GUIO_KQ7_DOS  GUIO5(GAMEOPTION_ENABLE_BLACK_LINED_VIDEO, \
-                            GUIO_NOASPECT, \
-                            GAMEOPTION_PREFER_DIGITAL_SFX, \
-                            GAMEOPTION_ORIGINAL_SAVELOAD, \
-                            GAMEOPTION_FB01_MIDI)
 
 	// King's Quest 7 - English Windows (from the King's Quest Collection)
 	// Executable scanning reports "2.100.002", VERSION file reports "1.4"
@@ -1801,7 +1796,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		{"resource.map", 0, "8676b0fbbd7362989a029fe72fea14c6", 18709},
 		{"resource.000", 0, "51c1ead1163e19a2de8f121c39df7a76", 200764100},
 		AD_LISTEND},
-		Common::EN_ANY, Common::kPlatformDOS, ADGF_UNSTABLE | ADGF_CD, GUIO_KQ7_DOS },
+		Common::EN_ANY, Common::kPlatformDOS, ADGF_UNSTABLE | ADGF_CD, GUIO_KQ7 },
 
 	// King's Quest 7 - English Windows (from FRG)
 	// SCI interpreter version 2.100.002, VERSION file reports "2.00b"
@@ -1817,7 +1812,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		{"resource.map", 0, "0b62693cbe87e3aaca3e8655a437f27f", 18709},
 		{"resource.000", 0, "51c1ead1163e19a2de8f121c39df7a76", 200764100},
 		AD_LISTEND},
-		Common::ES_ESP, Common::kPlatformDOS, ADGF_UNSTABLE | ADGF_CD, GUIO_KQ7_DOS },
+		Common::ES_ESP, Common::kPlatformDOS, ADGF_UNSTABLE | ADGF_CD, GUIO_KQ7 },
 
 	// King's Quest 7 - English DOS Non-Interactive Demo
 	// SCI interpreter version 2.100.002