aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gfx/gfx_resmgr.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-03-30 07:53:32 +0000
committerFilippos Karapetis2009-03-30 07:53:32 +0000
commite130aecc4f2650d86a41ee4d963b66e5421226bb (patch)
tree60b3a461c58166145fe5ec262a15c1cf94271d78 /engines/sci/gfx/gfx_resmgr.cpp
parent30473e313d8e4513a11dd29ea353db297d5223b4 (diff)
downloadscummvm-rg350-e130aecc4f2650d86a41ee4d963b66e5421226bb.tar.gz
scummvm-rg350-e130aecc4f2650d86a41ee4d963b66e5421226bb.tar.bz2
scummvm-rg350-e130aecc4f2650d86a41ee4d963b66e5421226bb.zip
Wrapped all the still WIP SCI32-specific code around appropriate ifdef blocks. SCI32 has fundamental differences from previous SCI versions (e.g. direct point addressing is no longer possible), most of SCI32 games use SVGA resolutions and currently a lot of SCI32 specific code is missing (like, for example, the newer string and array handling functions, the widget system etc). This has been done in the same manner as in the SCUMM and SAGA engines.
svn-id: r39750
Diffstat (limited to 'engines/sci/gfx/gfx_resmgr.cpp')
-rw-r--r--engines/sci/gfx/gfx_resmgr.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp
index c81b6c83d6..a7e22129ec 100644
--- a/engines/sci/gfx/gfx_resmgr.cpp
+++ b/engines/sci/gfx/gfx_resmgr.cpp
@@ -55,8 +55,12 @@ GfxResManager::GfxResManager(int version, gfx_options_t *options, gfx_driver_t *
if (_version < SCI_VERSION_01_VGA) {
_staticPalette = gfx_sci0_pic_colors->getref();
- } else if (_version == SCI_VERSION_1_1 || _version == SCI_VERSION_32) {
+ } else if (_version == SCI_VERSION_1_1) {
GFXDEBUG("Palettes are not yet supported in this SCI version\n");
+#ifdef ENABLE_SCI32
+ } else if (_version == SCI_VERSION_32) {
+ GFXDEBUG("Palettes are not yet supported in this SCI version\n");
+#endif
} else {
Resource *res = resManager->findResource(kResourceTypePalette, 999, 0);
if (res && res->data)