aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.cpp
diff options
context:
space:
mode:
authorNorbert Lange2009-08-24 12:39:03 +0000
committerNorbert Lange2009-08-24 12:39:03 +0000
commit184aae3c8c863541771fbeb09ce5f1a72ecabb95 (patch)
treeec822b0d376e9cb7ab3e8f1830cd3b87f5c10d11 /engines/scumm/scumm.cpp
parent40aac5fbf7a2f582ecc38d99c67a52e5fefdff17 (diff)
downloadscummvm-rg350-184aae3c8c863541771fbeb09ce5f1a72ecabb95.tar.gz
scummvm-rg350-184aae3c8c863541771fbeb09ce5f1a72ecabb95.tar.bz2
scummvm-rg350-184aae3c8c863541771fbeb09ce5f1a72ecabb95.zip
Enable alternative palettse for Amiga Monkey Island - Patch ID: 2819787
use tables for palette colors instead of code with constants svn-id: r43696
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r--engines/scumm/scumm.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 9f3ebb8053..af6b9278c6 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -499,7 +499,9 @@ 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;