aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.cpp
diff options
context:
space:
mode:
authorTravis Howell2009-11-22 11:43:12 +0000
committerTravis Howell2009-11-22 11:43:12 +0000
commitbb0c7657316942859a7a8575236320cf819d07c6 (patch)
tree2636599815e0fedc9c0567cad31ada8395242f08 /engines/scumm/scumm.cpp
parent6c2cc3e1bbc626f671432fa0a37d6317222caa5d (diff)
downloadscummvm-rg350-bb0c7657316942859a7a8575236320cf819d07c6.tar.gz
scummvm-rg350-bb0c7657316942859a7a8575236320cf819d07c6.tar.bz2
scummvm-rg350-bb0c7657316942859a7a8575236320cf819d07c6.zip
Exclude Loom PCE engine specific code, from non-16bit color build.
svn-id: r46080
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r--engines/scumm/scumm.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 8e93b4a929..4278a08077 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -113,10 +113,13 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
if (_game.platform == Common::kPlatformNES) {
_gdi = new GdiNES(this);
- } else if (_game.platform == Common::kPlatformPCEngine) {
- _gdi = new GdiPCEngine(this);
+#ifdef USE_RGB_COLOR
} else if (_game.features & GF_16BIT_COLOR) {
- _gdi = new Gdi16Bit(this);
+ if (_game.platform == Common::kPlatformPCEngine)
+ _gdi = new GdiPCEngine(this);
+ else
+ _gdi = new Gdi16Bit(this);
+#endif
} else if (_game.version <= 1) {
_gdi = new GdiV1(this);
} else if (_game.version == 2) {
@@ -1270,9 +1273,11 @@ void ScummEngine::setupCharsetRenderer() {
else
_charset = new CharsetRendererV2(this, _language);
} else if (_game.version == 3) {
+#ifdef USE_RGB_COLOR
if (_game.platform == Common::kPlatformPCEngine)
_charset = new CharsetRendererPCE(this);
else
+#endif
_charset = new CharsetRendererV3(this);
#ifdef ENABLE_SCUMM_7_8
} else if (_game.version == 8) {
@@ -1293,9 +1298,11 @@ void ScummEngine::setupCostumeRenderer() {
} else if (_game.platform == Common::kPlatformNES) {
_costumeRenderer = new NESCostumeRenderer(this);
_costumeLoader = new NESCostumeLoader(this);
+#ifdef USE_RGB_COLOR
} else if (_game.platform == Common::kPlatformPCEngine) {
_costumeRenderer = new PCEngineCostumeRenderer(this);
_costumeLoader = new ClassicCostumeLoader(this);
+#endif
} else {
_costumeRenderer = new ClassicCostumeRenderer(this);
_costumeLoader = new ClassicCostumeLoader(this);