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

[waltervn]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9b9e4e957d ADL: Clarify mono/color game options
a5380b73f2 ADL: Use recently-added kPlatformApple2


Commit: 9b9e4e957d0168c11a3032bb4aba8bed96887a89
    https://github.com/scummvm/scummvm/commit/9b9e4e957d0168c11a3032bb4aba8bed96887a89
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2016-08-08T23:12:53+02:00

Commit Message:
ADL: Clarify mono/color game options

Changed paths:
    engines/adl/detection.cpp



diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp
index 12405e7..51b2389 100644
--- a/engines/adl/detection.cpp
+++ b/engines/adl/detection.cpp
@@ -32,13 +32,15 @@
 
 namespace Adl {
 
-#define GAMEOPTION_COLOR     GUIO_GAMEOPTIONS1
-#define GAMEOPTION_SCANLINES GUIO_GAMEOPTIONS2
-#define GAMEOPTION_MONO      GUIO_GAMEOPTIONS3
+// Mystery House was designed for monochrome display, so we default to
+// monochrome mode there. All the other games default to color mode.
+#define GAMEOPTION_COLOR_DEFAULT_OFF GUIO_GAMEOPTIONS1
+#define GAMEOPTION_SCANLINES         GUIO_GAMEOPTIONS2
+#define GAMEOPTION_COLOR_DEFAULT_ON  GUIO_GAMEOPTIONS3
 
 static const ADExtraGuiOptionsMap optionsList[] = {
 	{
-		GAMEOPTION_COLOR,
+		GAMEOPTION_COLOR_DEFAULT_OFF,
 		{
 			_s("Color mode"),
 			_s("Use color graphics"),
@@ -48,7 +50,7 @@ static const ADExtraGuiOptionsMap optionsList[] = {
 	},
 
 	{
-		GAMEOPTION_MONO,
+		GAMEOPTION_COLOR_DEFAULT_ON,
 		{
 			_s("Color mode"),
 			_s("Use color graphics"),
@@ -91,7 +93,7 @@ static const AdlGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformApple2GS, // FIXME
 			ADGF_UNSTABLE,
-			GUIO2(GAMEOPTION_COLOR, GAMEOPTION_SCANLINES)
+			GUIO2(GAMEOPTION_COLOR_DEFAULT_OFF, GAMEOPTION_SCANLINES)
 		},
 		GAME_TYPE_HIRES1
 	},
@@ -105,7 +107,7 @@ static const AdlGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformApple2GS, // FIXME
 			ADGF_UNSTABLE,
-			GUIO2(GAMEOPTION_COLOR, GAMEOPTION_SCANLINES)
+			GUIO2(GAMEOPTION_COLOR_DEFAULT_OFF, GAMEOPTION_SCANLINES)
 		},
 		GAME_TYPE_HIRES1
 	},
@@ -119,7 +121,7 @@ static const AdlGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformApple2GS, // FIXME
 			ADGF_UNSTABLE,
-			GUIO2(GAMEOPTION_MONO, GAMEOPTION_SCANLINES)
+			GUIO2(GAMEOPTION_COLOR_DEFAULT_ON, GAMEOPTION_SCANLINES)
 		},
 		GAME_TYPE_HIRES2
 	},
@@ -133,7 +135,7 @@ static const AdlGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformApple2GS, // FIXME
 			ADGF_UNSTABLE,
-			GUIO2(GAMEOPTION_MONO, GAMEOPTION_SCANLINES)
+			GUIO2(GAMEOPTION_COLOR_DEFAULT_ON, GAMEOPTION_SCANLINES)
 		},
 		GAME_TYPE_HIRES0
 	},
@@ -150,7 +152,7 @@ static const AdlGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformApple2GS, // FIXME
 			ADGF_UNSTABLE,
-			GUIO2(GAMEOPTION_MONO, GAMEOPTION_SCANLINES)
+			GUIO2(GAMEOPTION_COLOR_DEFAULT_ON, GAMEOPTION_SCANLINES)
 		},
 		GAME_TYPE_HIRES6
 	},


Commit: a5380b73f26dcbb9cadd678fc739aa1289aa51a0
    https://github.com/scummvm/scummvm/commit/a5380b73f26dcbb9cadd678fc739aa1289aa51a0
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2016-08-08T23:12:53+02:00

Commit Message:
ADL: Use recently-added kPlatformApple2

Changed paths:
    engines/adl/detection.cpp



diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp
index 51b2389..6a85f98 100644
--- a/engines/adl/detection.cpp
+++ b/engines/adl/detection.cpp
@@ -91,7 +91,7 @@ static const AdlGameDescription gameDescriptions[] = {
 				AD_LISTEND
 			},
 			Common::EN_ANY,
-			Common::kPlatformApple2GS, // FIXME
+			Common::kPlatformApple2,
 			ADGF_UNSTABLE,
 			GUIO2(GAMEOPTION_COLOR_DEFAULT_OFF, GAMEOPTION_SCANLINES)
 		},
@@ -105,7 +105,7 @@ static const AdlGameDescription gameDescriptions[] = {
 				AD_LISTEND
 			},
 			Common::EN_ANY,
-			Common::kPlatformApple2GS, // FIXME
+			Common::kPlatformApple2,
 			ADGF_UNSTABLE,
 			GUIO2(GAMEOPTION_COLOR_DEFAULT_OFF, GAMEOPTION_SCANLINES)
 		},
@@ -119,7 +119,7 @@ static const AdlGameDescription gameDescriptions[] = {
 				AD_LISTEND
 			},
 			Common::EN_ANY,
-			Common::kPlatformApple2GS, // FIXME
+			Common::kPlatformApple2,
 			ADGF_UNSTABLE,
 			GUIO2(GAMEOPTION_COLOR_DEFAULT_ON, GAMEOPTION_SCANLINES)
 		},
@@ -133,7 +133,7 @@ static const AdlGameDescription gameDescriptions[] = {
 				AD_LISTEND
 			},
 			Common::EN_ANY,
-			Common::kPlatformApple2GS, // FIXME
+			Common::kPlatformApple2,
 			ADGF_UNSTABLE,
 			GUIO2(GAMEOPTION_COLOR_DEFAULT_ON, GAMEOPTION_SCANLINES)
 		},
@@ -150,7 +150,7 @@ static const AdlGameDescription gameDescriptions[] = {
 				AD_LISTEND
 			},
 			Common::EN_ANY,
-			Common::kPlatformApple2GS, // FIXME
+			Common::kPlatformApple2,
 			ADGF_UNSTABLE,
 			GUIO2(GAMEOPTION_COLOR_DEFAULT_ON, GAMEOPTION_SCANLINES)
 		},