[Scummvm-git-logs] scummvm master -> aefb23d44cf43008f591eb7fc3fabcf2520b43c4

[athrxx]

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:
aefb23d44c GUI: add missing GUIO settings for mac b/w mode


Commit: aefb23d44cf43008f591eb7fc3fabcf2520b43c4
    https://github.com/scummvm/scummvm/commit/aefb23d44cf43008f591eb7fc3fabcf2520b43c4
Author: athrxx (athrxx at scummvm.org)
Date: 2021-11-14T16:19:32+01:00

Commit Message:
GUI: add missing GUIO settings for mac b/w mode

(I noticed that I got offered macintosh b/w mode for EOB DOS and Amiga versions)

Changed paths:
    common/gui_options.cpp
    common/gui_options.h
    common/rendermode.cpp


diff --git a/common/gui_options.cpp b/common/gui_options.cpp
index 6cf846de17..57dec10c60 100644
--- a/common/gui_options.cpp
+++ b/common/gui_options.cpp
@@ -61,18 +61,19 @@ const struct GameOpt {
 
 	{ GUIO_NOASPECT,     "noAspect" },
 
-	{ GUIO_RENDERHERCGREEN, "hercGreen" },
-	{ GUIO_RENDERHERCAMBER, "hercAmber" },
-	{ GUIO_RENDERCGA,       "cga" },
-	{ GUIO_RENDEREGA,       "ega" },
-	{ GUIO_RENDERVGA,       "vga" },
-	{ GUIO_RENDERAMIGA,     "amiga" },
-	{ GUIO_RENDERFMTOWNS,   "fmtowns" },
-	{ GUIO_RENDERPC9821,    "pc9821" },
-	{ GUIO_RENDERPC9801,    "pc9801" },
-	{ GUIO_RENDERAPPLE2GS,  "2gs" },
-	{ GUIO_RENDERATARIST,   "atari" },
-	{ GUIO_RENDERMACINTOSH, "macintosh" },
+	{ GUIO_RENDERHERCGREEN,		"hercGreen" },
+	{ GUIO_RENDERHERCAMBER,		"hercAmber" },
+	{ GUIO_RENDERCGA,			"cga" },
+	{ GUIO_RENDEREGA,			"ega" },
+	{ GUIO_RENDERVGA,			"vga" },
+	{ GUIO_RENDERAMIGA,			"amiga" },
+	{ GUIO_RENDERFMTOWNS,		"fmtowns" },
+	{ GUIO_RENDERPC9821,		"pc9821" },
+	{ GUIO_RENDERPC9801,		 "pc9801" },
+	{ GUIO_RENDERAPPLE2GS,		"2gs" },
+	{ GUIO_RENDERATARIST,		"atari" },
+	{ GUIO_RENDERMACINTOSH,		"macintosh" },
+	{ GUIO_RENDERMACINTOSHBW,	"macintoshbw" },
 
 	{ GUIO_GAMEOPTIONS1, "gameOption1" },
 	{ GUIO_GAMEOPTIONS2, "gameOption2" },
diff --git a/common/gui_options.h b/common/gui_options.h
index 88b0127bfe..566500833e 100644
--- a/common/gui_options.h
+++ b/common/gui_options.h
@@ -47,18 +47,19 @@
 
 #define GUIO_NOASPECT        "\x13"
 
-#define GUIO_RENDERHERCGREEN "\x18"
-#define GUIO_RENDERHERCAMBER "\x19"
-#define GUIO_RENDERCGA       "\x1a"
-#define GUIO_RENDEREGA       "\x1b"
-#define GUIO_RENDERVGA       "\x1c"
-#define GUIO_RENDERAMIGA     "\x1d"
-#define GUIO_RENDERFMTOWNS   "\x1e"
-#define GUIO_RENDERPC9821    "\x1f"
-#define GUIO_RENDERPC9801    "\x20"
-#define GUIO_RENDERAPPLE2GS  "\x21"
-#define GUIO_RENDERATARIST   "\x22"
-#define GUIO_RENDERMACINTOSH "\x23"
+#define GUIO_RENDERHERCGREEN	"\x18"
+#define GUIO_RENDERHERCAMBER	"\x19"
+#define GUIO_RENDERCGA			"\x1a"
+#define GUIO_RENDEREGA			"\x1b"
+#define GUIO_RENDERVGA			"\x1c"
+#define GUIO_RENDERAMIGA		"\x1d"
+#define GUIO_RENDERFMTOWNS		"\x1e"
+#define GUIO_RENDERPC9821		"\x1f"
+#define GUIO_RENDERPC9801		"\x20"
+#define GUIO_RENDERAPPLE2GS		"\x21"
+#define GUIO_RENDERATARIST		"\x22"
+#define GUIO_RENDERMACINTOSH	"\x23"
+#define GUIO_RENDERMACINTOSHBW	"\x28"	// Setting this to 0x28 is not ideal, but there is no free slot left. Maybe we need to migrate to 3-digit numbers...
 
 #define GUIO_LINKSPEECHTOSFX "\x24"
 #define GUIO_LINKMUSICTOSFX  "\x25"
diff --git a/common/rendermode.cpp b/common/rendermode.cpp
index 0907190ef5..e126c6352b 100644
--- a/common/rendermode.cpp
+++ b/common/rendermode.cpp
@@ -58,18 +58,19 @@ struct RenderGUIOMapping {
 // could be used to indicate "any" mode when passed to renderMode2GUIO (if
 // we wanted to merge allRenderModesGUIOs back into)
 static const RenderGUIOMapping s_renderGUIOMapping[] = {
-	{ kRenderHercG,     GUIO_RENDERHERCGREEN },
-	{ kRenderHercA,     GUIO_RENDERHERCAMBER },
-	{ kRenderCGA,       GUIO_RENDERCGA },
-	{ kRenderEGA,       GUIO_RENDEREGA },
-	{ kRenderVGA,       GUIO_RENDERVGA },
-	{ kRenderAmiga,     GUIO_RENDERAMIGA },
-	{ kRenderFMTowns,   GUIO_RENDERFMTOWNS },
-	{ kRenderPC9821,    GUIO_RENDERPC9821 },
-	{ kRenderPC9801,    GUIO_RENDERPC9801 },
-	{ kRenderApple2GS,  GUIO_RENDERAPPLE2GS },
-	{ kRenderAtariST,   GUIO_RENDERATARIST },
-	{ kRenderMacintosh, GUIO_RENDERMACINTOSH }
+	{ kRenderHercG,			GUIO_RENDERHERCGREEN },
+	{ kRenderHercA,			GUIO_RENDERHERCAMBER },
+	{ kRenderCGA,		    GUIO_RENDERCGA },
+	{ kRenderEGA,		    GUIO_RENDEREGA },
+	{ kRenderVGA,			GUIO_RENDERVGA },
+	{ kRenderAmiga,			GUIO_RENDERAMIGA },
+	{ kRenderFMTowns,		GUIO_RENDERFMTOWNS },
+	{ kRenderPC9821,		GUIO_RENDERPC9821 },
+	{ kRenderPC9801,		GUIO_RENDERPC9801 },
+	{ kRenderApple2GS,		GUIO_RENDERAPPLE2GS },
+	{ kRenderAtariST,		GUIO_RENDERATARIST },
+	{ kRenderMacintosh,		GUIO_RENDERMACINTOSH },
+	{ kRenderMacintoshBW,	GUIO_RENDERMACINTOSHBW }
 };
 
 DECLARE_TRANSLATION_ADDITIONAL_CONTEXT("Hercules Green", "lowres")