aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorJody Northup2009-06-20 05:23:09 +0000
committerJody Northup2009-06-20 05:23:09 +0000
commitf7dd1c15ed38418a0371032966144eb6c2e004cb (patch)
treedc292bcaf9c657bd1db9efbc56195e70c578ea0e /engines/scumm
parent8b6ed92376024f43876af93fdfccd72d6fc33ac0 (diff)
downloadscummvm-rg350-f7dd1c15ed38418a0371032966144eb6c2e004cb.tar.gz
scummvm-rg350-f7dd1c15ed38418a0371032966144eb6c2e004cb.tar.bz2
scummvm-rg350-f7dd1c15ed38418a0371032966144eb6c2e004cb.zip
renamed ENABLE_16BIT define to more accurate ENABLE_RGB_COLOR
svn-id: r41696
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/cursor.cpp2
-rw-r--r--engines/scumm/scumm.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 30483a638c..5c695e58a5 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -112,7 +112,7 @@ void ScummEngine_v6::setCursorTransparency(int a) {
void ScummEngine::updateCursor() {
int transColor = (_game.heversion >= 80) ? 5 : 255;
-#ifdef ENABLE_16BIT
+#ifdef ENABLE_RGB_COLOR
CursorMan.replaceCursorFormat(_system->getScreenFormat());
#endif
CursorMan.replaceCursor(_grabbedCursor, _cursor.width, _cursor.height,
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 75a03aae0f..cab8db2d45 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1084,7 +1084,7 @@ Common::Error ScummEngine::init() {
// there is no text surface for them. This takes that into account
(_screenWidth * _textSurfaceMultiplier > 320));
} else if (_game.features & GF_16BIT_COLOR) {
-#ifdef ENABLE_16BIT
+#ifdef ENABLE_RGB_COLOR
Graphics::PixelFormat format = Graphics::PixelFormat::createFormatRGB555();
initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, format);
if (format != _system->getScreenFormat())