aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/engine.cpp6
-rw-r--r--engines/engine.h4
-rw-r--r--engines/scumm/cursor.cpp2
-rw-r--r--engines/scumm/scumm.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/engine.cpp b/engines/engine.cpp
index fdf0186a89..15c6820f22 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -125,7 +125,7 @@ void initCommonGFX(bool defaultTo1XScaler) {
g_system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
}
void initGraphics(int width, int height, bool defaultTo1xScaler) {
-#ifdef ENABLE_16BIT
+#ifdef ENABLE_RGB_COLOR
initGraphics(width,height,defaultTo1xScaler, Graphics::PixelFormat::createFormatCLUT8());
}
void initGraphics(int width, int height, bool defaultTo1xScaler, Graphics::PixelFormat format) {
@@ -134,7 +134,7 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, Graphics::Pixel
g_system->beginGFXTransaction();
initCommonGFX(defaultTo1xScaler);
-#ifdef ENABLE_16BIT
+#ifdef ENABLE_RGB_COLOR
g_system->initFormat(format);
#endif
g_system->initSize(width, height);
@@ -158,7 +158,7 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, Graphics::Pixel
}
// Just show warnings then these occur:
-#ifdef ENABLE_16BIT
+#ifdef ENABLE_RGB_COLOR
if (gfxError & OSystem::kTransactionPixelFormatNotSupported) {
Common::String message = "Could not initialize color format.";
diff --git a/engines/engine.h b/engines/engine.h
index 1ea1b70b5d..864450d6e1 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -29,7 +29,7 @@
#include "common/error.h"
#include "common/fs.h"
#include "common/str.h"
-#ifdef ENABLE_16BIT
+#ifdef ENABLE_RGB_COLOR
#include "graphics/pixelformat.h"
#endif
@@ -62,7 +62,7 @@ void initCommonGFX(bool defaultTo1XScaler);
* Errors out when backend is not able to switch to the specified
* mode.
*/
-#ifdef ENABLE_16BIT
+#ifdef ENABLE_RGB_COLOR
void initGraphics(int width, int height, bool defaultTo1xScaler, Graphics::PixelFormat format);
#endif
void initGraphics(int width, int height, bool defaultTo1xScaler);
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())