COMMON: Add render modes for Apple IIgs and Atari ST.

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

6 files changed, 25 insertions, 13 deletions

diff --git a/README b/README
index a34856c81e..e94cb86b53 100644
--- a/README
+++ b/README
@@ -1168,8 +1168,9 @@ arguments -- see the next section.
   --output-rate=RATE       Select output sample rate in Hz (e.g. 22050)
   --opl-driver=DRIVER      Select AdLib (OPL) emulator (db, mame)
   --aspect-ratio           Enable aspect ratio correction
-  --render-mode=MODE       Enable additional render modes (cga, ega, hercGreen,
-                           hercAmber, amiga)
+  --render-mode=MODE       Enable additional render modes (hercGreen, hercAmber,
+                           cga, ega, vga, amiga, fmtowns, pc9821, pc9801, 2gs,
+                           atari)
 
   --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 285fd632b7..783af47553 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -116,8 +116,9 @@ static const char HELP_STRING[] =
 	"  --output-rate=RATE       Select output sample rate in Hz (e.g. 22050)\n"
 	"  --opl-driver=DRIVER      Select AdLib (OPL) emulator (db, mame)\n"
 	"  --aspect-ratio           Enable aspect ratio correction\n"
-	"  --render-mode=MODE       Enable additional render modes (cga, ega, hercGreen,\n"
-	"                           hercAmber, amiga)\n"
+	"  --render-mode=MODE       Enable additional render modes (hercGreen, hercAmber,\n"
+	"                           cga, ega, vga, amiga, fmtowns, pc9821, pc9801, 2gs,\n"
+	"                           atari)\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 d79bf1b82f..ab5a132849 100644
--- a/common/gui_options.cpp
+++ b/common/gui_options.cpp
@@ -62,6 +62,8 @@ const struct GameOpt {
 	{ GUIO_RENDERFMTOWNS,	"fmtowns" },
 	{ GUIO_RENDERPC9821,	"pc9821" },
 	{ GUIO_RENDERPC9801,	"pc9801" },
+	{ GUIO_RENDERAPPLE2GS,	"2gs" },
+	{ GUIO_RENDERATARIST,	"atari" },
 
 	{ GUIO_GAMEOPTIONS1, "gameOption1" },
 	{ GUIO_GAMEOPTIONS2, "gameOption2" },
diff --git a/common/gui_options.h b/common/gui_options.h
index 78e9cc7199..b608fa3356 100644
--- a/common/gui_options.h
+++ b/common/gui_options.h
@@ -54,16 +54,18 @@
 #define GUIO_RENDERFMTOWNS	"\036"
 #define GUIO_RENDERPC9821	"\037"
 #define GUIO_RENDERPC9801	"\040"
+#define GUIO_RENDERAPPLE2GS	"\041"
+#define GUIO_RENDERATARIST	"\042"
 
 // Special GUIO flags for the AdvancedDetector's caching of game specific
 // options.
-#define GUIO_GAMEOPTIONS1	"\041"
-#define GUIO_GAMEOPTIONS2	"\042"
-#define GUIO_GAMEOPTIONS3	"\043"
-#define GUIO_GAMEOPTIONS4	"\044"
-#define GUIO_GAMEOPTIONS5	"\045"
-#define GUIO_GAMEOPTIONS6	"\046"
-#define GUIO_GAMEOPTIONS7	"\047"
+#define GUIO_GAMEOPTIONS1	"\050"
+#define GUIO_GAMEOPTIONS2	"\051"
+#define GUIO_GAMEOPTIONS3	"\052"
+#define GUIO_GAMEOPTIONS4	"\053"
+#define GUIO_GAMEOPTIONS5	"\054"
+#define GUIO_GAMEOPTIONS6	"\055"
+#define GUIO_GAMEOPTIONS7	"\056"
 
 #define GUIO0() (GUIO_NONE)
 #define GUIO1(a) (a)
diff --git a/common/rendermode.cpp b/common/rendermode.cpp
index 6115666399..9ee47327d5 100644
--- a/common/rendermode.cpp
+++ b/common/rendermode.cpp
@@ -41,6 +41,8 @@ const RenderModeDescription g_renderModes[] = {
 	{ "fmtowns", "FM-Towns", kRenderFMTowns },
 	{ "pc9821", "PC-9821 (256 Colors)", kRenderPC9821 },
 	{ "pc9801", "PC-9801 (16 Colors)", kRenderPC9801 },
+	{ "2gs", "Apple IIgs", kRenderApple2GS },
+	{ "atari", "Atari ST", kRenderAtariST },
 	{0, 0, kRenderDefault}
 };
 
@@ -61,7 +63,9 @@ static const RenderGUIOMapping s_renderGUIOMapping[] = {
 	{ kRenderAmiga,		GUIO_RENDERAMIGA },
 	{ kRenderFMTowns,	GUIO_RENDERFMTOWNS },
 	{ kRenderPC9821,	GUIO_RENDERPC9821 },
-	{ kRenderPC9801,	GUIO_RENDERPC9801 }
+	{ kRenderPC9801,	GUIO_RENDERPC9801 },
+	{ kRenderApple2GS,	GUIO_RENDERAPPLE2GS },
+	{ kRenderAtariST,	GUIO_RENDERATARIST }
 };
 
 DECLARE_TRANSLATION_ADDITIONAL_CONTEXT("Hercules Green", "lowres")
diff --git a/common/rendermode.h b/common/rendermode.h
index 59fa860c6c..49dfaab565 100644
--- a/common/rendermode.h
+++ b/common/rendermode.h
@@ -45,7 +45,9 @@ enum RenderMode {
 	kRenderAmiga = 6,
 	kRenderFMTowns = 7,
 	kRenderPC9821 = 8,
-	kRenderPC9801 = 9
+	kRenderPC9801 = 9,
+	kRenderApple2GS = 10,
+	kRenderAtariST = 11
 };
 
 struct RenderModeDescription {