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/graphics/palette.h | |
| 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/graphics/palette.h')
| -rw-r--r-- | engines/sci/graphics/palette.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/graphics/palette.h b/engines/sci/graphics/palette.h index 243420cc47..a9ea1c32de 100644 --- a/engines/sci/graphics/palette.h +++ b/engines/sci/graphics/palette.h @@ -36,7 +36,7 @@ class GfxScreen; */ class GfxPalette : public Common::Serializable { public: - GfxPalette(ResourceManager *resMan, GfxScreen *screen, bool useMerging); + GfxPalette(ResourceManager *resMan, GfxScreen *screen); ~GfxPalette(); bool isMerging(); |