diff options
| author | Norbert Lange | 2009-06-30 17:41:24 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-06-30 17:41:24 +0000 |
| commit | e3a5da7b7ed1581e31b47dceabddb46f49b29cd7 (patch) | |
| tree | 61b00799ab74383ec024a7b345d9506c35863b17 /engines/scumm/scumm.cpp | |
| parent | cf351dffe6f91e43496080aba2b9df51aa10f061 (diff) | |
| download | scummvm-rg350-e3a5da7b7ed1581e31b47dceabddb46f49b29cd7.tar.gz scummvm-rg350-e3a5da7b7ed1581e31b47dceabddb46f49b29cd7.tar.bz2 scummvm-rg350-e3a5da7b7ed1581e31b47dceabddb46f49b29cd7.zip | |
engines/scumm/*: enabled choosing of the colorpalette, by setting RenderMode to EGA the "old" palette will be used
tfmx/tfmxplayer.cpp: removed some unused stuff
sound/mods/tfmx.cpp: emulating the way MI initialises new macro-programms. (Difference might not be audible at all)
svn-id: r41976
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 5fcde33346..6716fda3fd 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -495,7 +495,8 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) case Common::kRenderCGA: case Common::kRenderEGA: case Common::kRenderAmiga: - if ((_game.version >= 4 && !(_game.features & GF_16COLOR)) || (_game.features & GF_OLD256)) + if ((_game.version >= 4 && !(_game.features & GF_16COLOR) && !(_game.platform == Common::kPlatformAmiga && _renderMode == Common::kRenderEGA)) + || (_game.features & GF_OLD256)) _renderMode = Common::kRenderDefault; break; |