From 935eaa175bb6df628f0118e70a59b895f65e92a1 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 19 Oct 2011 23:44:34 +0300
Subject: SCI: Move the palette merging checking code inside the GfxPalette
 class

---
 engines/sci/graphics/palette.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/sci/graphics/palette.h')

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();
-- 
cgit v1.2.3