aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/resource.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2011-10-19 23:44:34 +0300
committerFilippos Karapetis2011-10-19 23:52:51 +0300
commit935eaa175bb6df628f0118e70a59b895f65e92a1 (patch)
tree14f5b5ec5441418a1ba94b937bc3db2f24c88835 /engines/sci/resource.cpp
parent9549583242f4efc445f134c63109f599319b1e26 (diff)
downloadscummvm-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/resource.cpp')
-rw-r--r--engines/sci/resource.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index d1eb350c94..c50d1b8d8a 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -2355,7 +2355,7 @@ bool ResourceManager::detectFontExtended() {
}
// detects, if SCI1.1 game uses palette merging or copying - this is supposed to only get used on SCI1.1 games
-bool ResourceManager::detectForPaletteMergingForSci11() {
+bool ResourceManager::detectPaletteMergingSci11() {
// Load palette 999 (default palette)
Resource *res = findResource(ResourceId(kResourceTypePalette, 999), false);