[Scummvm-cvs-logs] scummvm master -> 29b37f473cf7fdab300d3a2cc389741722495fb1

[lordhoto]

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:
29b37f473c COMMON: Add render mode for Macintosh.


Commit: 29b37f473cf7fdab300d3a2cc389741722495fb1
    https://github.com/scummvm/scummvm/commit/29b37f473cf7fdab300d3a2cc389741722495fb1
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-05T12:38:28+01:00

Commit Message:
COMMON: Add render mode for Macintosh.

On request of m_kiewitz who wants to use it for AGI.

Changed paths:
    README
    base/commandLine.cpp
    common/gui_options.cpp
    common/gui_options.h
    common/rendermode.cpp
    common/rendermode.h



diff --git a/README b/README
index 4ddc465..996eca2 100644
--- a/README
+++ b/README
@@ -1351,7 +1351,7 @@ arguments -- see the next section.
   --aspect-ratio           Enable aspect ratio correction
   --render-mode=MODE       Enable additional render modes (hercGreen, hercAmber,
                            cga, ega, vga, amiga, fmtowns, pc9821, pc9801, 2gs,
-                           atari)
+                           atari, macintosh)
 
   --alt-intro              Use alternative intro for CD versions of Beneath a
                            Steel Sky and Flight of the Amazon Queen
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 783af47..19702ea 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -118,7 +118,7 @@ static const char HELP_STRING[] =
 	"  --aspect-ratio           Enable aspect ratio correction\n"
 	"  --render-mode=MODE       Enable additional render modes (hercGreen, hercAmber,\n"
 	"                           cga, ega, vga, amiga, fmtowns, pc9821, pc9801, 2gs,\n"
-	"                           atari)\n"
+	"                           atari, macintosh)\n"
 #ifdef ENABLE_EVENTRECORDER
 	"  --record-mode=MODE       Specify record mode for event recorder (record, playback,\n"
 	"                           passthrough [default])\n"
diff --git a/common/gui_options.cpp b/common/gui_options.cpp
index 641daf5..473f78c 100644
--- a/common/gui_options.cpp
+++ b/common/gui_options.cpp
@@ -64,6 +64,7 @@ const struct GameOpt {
 	{ GUIO_RENDERPC9801,    "pc9801" },
 	{ GUIO_RENDERAPPLE2GS,  "2gs" },
 	{ GUIO_RENDERATARIST,   "atari" },
+	{ GUIO_RENDERMACINTOSH, "macintosh" },
 
 	{ GUIO_GAMEOPTIONS1, "gameOption1" },
 	{ GUIO_GAMEOPTIONS2, "gameOption2" },
diff --git a/common/gui_options.h b/common/gui_options.h
index c11fc9e..aa15d90 100644
--- a/common/gui_options.h
+++ b/common/gui_options.h
@@ -56,6 +56,7 @@
 #define GUIO_RENDERPC9801    "\040"
 #define GUIO_RENDERAPPLE2GS  "\041"
 #define GUIO_RENDERATARIST   "\042"
+#define GUIO_RENDERMACINTOSH "\043"
 
 // Special GUIO flags for the AdvancedDetector's caching of game specific
 // options.
diff --git a/common/rendermode.cpp b/common/rendermode.cpp
index 6fa91fa..e07cac4 100644
--- a/common/rendermode.cpp
+++ b/common/rendermode.cpp
@@ -43,6 +43,7 @@ const RenderModeDescription g_renderModes[] = {
 	{ "pc9801", _s("PC-9801 (16 Colors)"), kRenderPC9801 },
 	{ "2gs", "Apple IIgs", kRenderApple2GS },
 	{ "atari", "Atari ST", kRenderAtariST },
+	{ "macintosh", "Macintosh", kRenderMacintosh },
 	{0, 0, kRenderDefault}
 };
 
@@ -65,7 +66,8 @@ static const RenderGUIOMapping s_renderGUIOMapping[] = {
 	{ kRenderPC9821,    GUIO_RENDERPC9821 },
 	{ kRenderPC9801,    GUIO_RENDERPC9801 },
 	{ kRenderApple2GS,  GUIO_RENDERAPPLE2GS },
-	{ kRenderAtariST,   GUIO_RENDERATARIST }
+	{ kRenderAtariST,   GUIO_RENDERATARIST },
+	{ kRenderMacintosh, GUIO_RENDERMACINTOSH }
 };
 
 DECLARE_TRANSLATION_ADDITIONAL_CONTEXT("Hercules Green", "lowres")
diff --git a/common/rendermode.h b/common/rendermode.h
index 49dfaab..ae1a7bc 100644
--- a/common/rendermode.h
+++ b/common/rendermode.h
@@ -47,7 +47,8 @@ enum RenderMode {
 	kRenderPC9821 = 8,
 	kRenderPC9801 = 9,
 	kRenderApple2GS = 10,
-	kRenderAtariST = 11
+	kRenderAtariST = 11,
+	kRenderMacintosh = 12
 };
 
 struct RenderModeDescription {