diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | base/gameDetector.cpp | 2 | ||||
| -rw-r--r-- | common/util.cpp | 1 | ||||
| -rw-r--r-- | common/util.h | 3 | ||||
| -rw-r--r-- | doc/05_01.tex | 2 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 7 |
6 files changed, 12 insertions, 5 deletions
@@ -374,7 +374,7 @@ arguments - see the next section. --output-rate=RATE Select output sample rate in Hz (e.g. 22050) --aspect-ratio Enable aspect ratio correction --render-mode=MODE Enable additional render modes (cga, ega, hercGreen - hercAmber) + hercAmber, amiga) --alt-intro Use alternative intro for CD versions of Beneath a Steel Sky and Flight of the Amazon Queen diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index 69aa818de3..861c696651 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -97,7 +97,7 @@ static const char USAGE_STRING[] = " --output-rate=RATE Select output sample rate in Hz (e.g. 22050)\n" " --aspect-ratio Enable aspect ratio correction\n" " --render-mode=MODE Enable additional render modes (cga, ega, hercGreen,\n" - " hercAmber)\n" + " hercAmber, amiga)\n" "\n" #if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN) " --alt-intro Use alternative intro for CD versions of Beneath a\n" diff --git a/common/util.cpp b/common/util.cpp index d2920fd64b..1effff310c 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -226,6 +226,7 @@ const RenderModeDescription g_renderModes[] = { {"hercAmber", "Hercules Amber", kRenderHercA}, {"cga", "CGA", kRenderCGA}, {"ega", "EGA", kRenderEGA}, + {"amiga", "Amiga", kRenderAmiga}, {0, 0, kRenderDefault} }; diff --git a/common/util.h b/common/util.h index b18797f9e9..a57d14efb4 100644 --- a/common/util.h +++ b/common/util.h @@ -163,7 +163,8 @@ enum RenderMode { kRenderEGA = 1, kRenderCGA = 2, kRenderHercG = 3, - kRenderHercA = 4 + kRenderHercA = 4, + kRenderAmiga = 5 }; enum HerculesDimesnions { diff --git a/doc/05_01.tex b/doc/05_01.tex index bbc9ea17ef..189b47d2b4 100644 --- a/doc/05_01.tex +++ b/doc/05_01.tex @@ -39,7 +39,7 @@ Usage: scummvm [OPTIONS]... [GAME]\\ --native-mt32 &True Roland MT-32 (disable GM emulation)\\ --output-rate=RATE &Select output sample rate in Hz (e.g. 22050)\\ --aspect-ratio &Enable aspect ratio correction\\ - --render-mode=MODE &Enable additional render modes (cga, ega, hercGreen, hercAmber)\\ + --render-mode=MODE &Enable additional render modes (cga, ega, hercGreen, hercAmber, amiga)\\ \\ --alt-intro &Use alternative intro for CD versions of Beneath a\\ &Steel Sky and Flight of the Amazon Queen\\ diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 713abd0cba..c0e7ad4d79 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1039,6 +1039,11 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS _renderMode = Common::kRenderDefault; break; + case Common::kRenderAmiga: + if (!(_features & GF_16COLOR)) + _renderMode = Common::kRenderDefault; + break; + default: break; } @@ -1318,7 +1323,7 @@ void ScummEngine::scummInit() { } else if (_features & GF_16COLOR) { for (i = 0; i < 16; i++) _shadowPalette[i] = i; - if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST)) + if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST) || _renderMode == Common::kRenderAmiga) setupAmigaPalette(); else if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) setupHercPalette(); |