diff options
| author | Norbert Lange | 2009-08-02 01:00:56 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-02 01:00:56 +0000 |
| commit | ed8f02af96b56137b75d48e32c87de7b825a33e3 (patch) | |
| tree | a8219e4514d8c2543a747b94aa8fc46cea6e5033 /engines/scumm/scumm.cpp | |
| parent | 2a4c60244bd57e807a88bc6064af1a265d33a130 (diff) | |
| download | scummvm-rg350-ed8f02af96b56137b75d48e32c87de7b825a33e3.tar.gz scummvm-rg350-ed8f02af96b56137b75d48e32c87de7b825a33e3.tar.bz2 scummvm-rg350-ed8f02af96b56137b75d48e32c87de7b825a33e3.zip | |
synced the branch with the palette patch (#2819787)
svn-id: r42987
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 5e3bd66b0a..99f9c8b083 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -494,7 +494,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.platform == Common::kPlatformAmiga && _renderMode == Common::kRenderEGA)) + if ((_game.version >= 4 && !(_game.features & GF_16COLOR) + && !(_game.platform == Common::kPlatformAmiga && _renderMode == Common::kRenderEGA)) || (_game.features & GF_OLD256)) _renderMode = Common::kRenderDefault; break; |