diff options
| author | Filippos Karapetis | 2011-10-19 23:44:34 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2011-10-19 23:52:51 +0300 |
| commit | 935eaa175bb6df628f0118e70a59b895f65e92a1 (patch) | |
| tree | 14f5b5ec5441418a1ba94b937bc3db2f24c88835 /engines/sci/sci.cpp | |
| parent | 9549583242f4efc445f134c63109f599319b1e26 (diff) | |
| download | scummvm-rg350-935eaa175bb6df628f0118e70a59b895f65e92a1.tar.gz scummvm-rg350-935eaa175bb6df628f0118e70a59b895f65e92a1.tar.bz2 scummvm-rg350-935eaa175bb6df628f0118e70a59b895f65e92a1.zip | |
SCI: Move the palette merging checking code inside the GfxPalette class
Diffstat (limited to 'engines/sci/sci.cpp')
| -rw-r--r-- | engines/sci/sci.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 6c1b6e4dd6..1d0d63870d 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -609,16 +609,7 @@ void SciEngine::initGraphics() { if (hasMacIconBar()) _gfxMacIconBar = new GfxMacIconBar(); - bool paletteMerging = true; - if (getSciVersion() >= SCI_VERSION_1_1) { - // there are some games that use inbetween SCI1.1 interpreter, so we have to detect if it's merging or copying - if (getSciVersion() == SCI_VERSION_1_1) - paletteMerging = _resMan->detectForPaletteMergingForSci11(); - else - paletteMerging = false; - } - - _gfxPalette = new GfxPalette(_resMan, _gfxScreen, paletteMerging); + _gfxPalette = new GfxPalette(_resMan, _gfxScreen); _gfxCache = new GfxCache(_resMan, _gfxScreen, _gfxPalette); _gfxCursor = new GfxCursor(_resMan, _gfxPalette, _gfxScreen); |