From 007f68366fd55a519753bf533c7c3a80db3754f0 Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Fri, 21 Aug 2009 18:16:37 +0000 Subject: Renamed ENABLE_RGB_COLOR to USE_RGB_COLOR, and added it to config.h to guarantee a consistent build. svn-id: r43604 --- Makefile.common | 4 ---- backends/platform/gp2x/graphics.cpp | 12 ++++++------ backends/platform/sdl/graphics.cpp | 30 +++++++++++++++--------------- backends/platform/sdl/sdl.cpp | 2 +- backends/platform/sdl/sdl.h | 8 ++++---- base/version.cpp | 2 +- common/system.h | 4 ++-- configure | 8 +++++++- dists/msvc8/ScummVM_Global.vsprops | 2 +- dists/msvc9/ScummVM_Global.vsprops | 2 +- engines/engine.cpp | 4 ++-- engines/groovie/roq.cpp | 6 +++--- engines/sci/sci.cpp | 2 +- engines/scumm/cursor.cpp | 2 +- engines/scumm/detection_tables.h | 4 ++-- engines/scumm/scumm.cpp | 2 +- graphics/cursorman.cpp | 4 ++-- graphics/cursorman.h | 4 ++-- graphics/pixelformat.h | 2 +- gui/ThemeEngine.cpp | 2 +- gui/ThemeEngine.h | 2 +- 21 files changed, 55 insertions(+), 53 deletions(-) diff --git a/Makefile.common b/Makefile.common index 824139b0bd..caf5ba22fa 100644 --- a/Makefile.common +++ b/Makefile.common @@ -37,10 +37,6 @@ ifdef DISABLE_SCALERS DEFINES += -DDISABLE_SCALERS endif -ifdef ENABLE_RGB_COLOR -DEFINES += -DENABLE_RGB_COLOR -endif - ifdef DISABLE_HQ_SCALERS DEFINES += -DDISABLE_HQ_SCALERS endif diff --git a/backends/platform/gp2x/graphics.cpp b/backends/platform/gp2x/graphics.cpp index d948cb82d3..cf874323e0 100644 --- a/backends/platform/gp2x/graphics.cpp +++ b/backends/platform/gp2x/graphics.cpp @@ -243,7 +243,7 @@ int OSystem_GP2X::getGraphicsMode() const { void OSystem_GP2X::initSize(uint w, uint h, const Graphics::PixelFormat *format) { assert(_transactionMode == kTransactionActive); -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR //avoid redundant format changes Graphics::PixelFormat newFormat; if (!format) @@ -1231,7 +1231,7 @@ void OSystem_GP2X::warpMouse(int x, int y) { } void OSystem_GP2X::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) { -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR if (!format) _cursorFormat = Graphics::PixelFormat::createFormatCLUT8(); else if (format->bytesPerPixel <= _screenFormat.bytesPerPixel) @@ -1274,7 +1274,7 @@ void OSystem_GP2X::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x } free(_mouseData); -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR _mouseData = (byte *)malloc(w * h * _cursorFormat.bytesPerPixel); memcpy(_mouseData, buf, w * h * _cursorFormat.bytesPerPixel); #else @@ -1288,7 +1288,7 @@ void OSystem_GP2X::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x void OSystem_GP2X::blitCursor() { byte *dstPtr; const byte *srcPtr = _mouseData; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR uint32 color; uint32 colormask = (1 << (_cursorFormat.bytesPerPixel << 3)) - 1; #else @@ -1327,7 +1327,7 @@ void OSystem_GP2X::blitCursor() { for (i = 0; i < h; i++) { for (j = 0; j < w; j++) { -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR if (_cursorFormat.bytesPerPixel > 1) { color = (*(uint32 *) srcPtr) & colormask; if (color != _mouseKeyColor) { // transparent, don't draw @@ -1347,7 +1347,7 @@ void OSystem_GP2X::blitCursor() { } dstPtr += 2; srcPtr++; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR } #endif } diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp index 3bfe8f5c98..d3a37f4de7 100644 --- a/backends/platform/sdl/graphics.cpp +++ b/backends/platform/sdl/graphics.cpp @@ -26,7 +26,7 @@ #include "backends/platform/sdl/sdl.h" #include "common/mutex.h" #include "common/util.h" -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR #include "common/list.h" #endif #include "graphics/font.h" @@ -100,7 +100,7 @@ void OSystem_SDL::beginGFXTransaction(void) { _transactionDetails.needUpdatescreen = false; _transactionDetails.normal1xScaler = false; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR _transactionDetails.formatChanged = false; #endif @@ -126,7 +126,7 @@ OSystem::TransactionError OSystem_SDL::endGFXTransaction(void) { _videoMode.mode = _oldVideoMode.mode; _videoMode.scaleFactor = _oldVideoMode.scaleFactor; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR } else if (_videoMode.format != _oldVideoMode.format) { errors |= kTransactionFormatNotSupported; @@ -156,7 +156,7 @@ OSystem::TransactionError OSystem_SDL::endGFXTransaction(void) { } } -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR if (_transactionDetails.sizeChanged || _transactionDetails.formatChanged) { #else if (_transactionDetails.sizeChanged) { @@ -209,7 +209,7 @@ OSystem::TransactionError OSystem_SDL::endGFXTransaction(void) { return (TransactionError)errors; } -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR const Graphics::PixelFormat RGBList[] = { #ifdef ENABLE_32BIT // RGBA8888, ARGB8888, RGB888 @@ -442,7 +442,7 @@ int OSystem_SDL::getGraphicsMode() const { void OSystem_SDL::initSize(uint w, uint h, const Graphics::PixelFormat *format) { assert(_transactionMode == kTransactionActive); -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR //avoid redundant format changes Graphics::PixelFormat newFormat; if (!format) @@ -543,7 +543,7 @@ bool OSystem_SDL::loadGFXMode() { // // Create the surface that contains the 8 bit game data // -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR _screen = SDL_CreateRGBSurface(SDL_SWSURFACE, _videoMode.screenWidth, _videoMode.screenHeight, _screenFormat.bytesPerPixel << 3, ((1 << _screenFormat.rBits()) - 1) << _screenFormat.rShift , @@ -1007,7 +1007,7 @@ void OSystem_SDL::copyRectToScreen(const byte *src, int pitch, int x, int y, int if (SDL_LockSurface(_screen) == -1) error("SDL_LockSurface failed: %s", SDL_GetError()); -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR byte *dst = (byte *)_screen->pixels + y * _videoMode.screenWidth * _screenFormat.bytesPerPixel + x * _screenFormat.bytesPerPixel; if (_videoMode.screenWidth == w && pitch == w * _screenFormat.bytesPerPixel) { memcpy(dst, src, h*w*_screenFormat.bytesPerPixel); @@ -1053,7 +1053,7 @@ Graphics::Surface *OSystem_SDL::lockScreen() { _framebuffer.w = _screen->w; _framebuffer.h = _screen->h; _framebuffer.pitch = _screen->pitch; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR _framebuffer.bytesPerPixel = _screenFormat.bytesPerPixel; #else _framebuffer.bytesPerPixel = 1; @@ -1241,7 +1241,7 @@ int16 OSystem_SDL::getWidth() { void OSystem_SDL::setPalette(const byte *colors, uint start, uint num) { assert(colors); -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR if (_screenFormat.bytesPerPixel > 1) return; //not using a paletted pixel format #endif @@ -1508,7 +1508,7 @@ void OSystem_SDL::warpMouse(int x, int y) { } void OSystem_SDL::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) { -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR if (!format) _cursorFormat = Graphics::PixelFormat::createFormatCLUT8(); else if (format->bytesPerPixel <= _screenFormat.bytesPerPixel) @@ -1551,7 +1551,7 @@ void OSystem_SDL::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, } free(_mouseData); -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR _mouseData = (byte *)malloc(w * h * _cursorFormat.bytesPerPixel); memcpy(_mouseData, buf, w * h * _cursorFormat.bytesPerPixel); #else @@ -1565,7 +1565,7 @@ void OSystem_SDL::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, void OSystem_SDL::blitCursor() { byte *dstPtr; const byte *srcPtr = _mouseData; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR uint32 color; uint32 colormask = (1 << (_cursorFormat.bytesPerPixel << 3)) - 1; #else @@ -1604,7 +1604,7 @@ void OSystem_SDL::blitCursor() { for (i = 0; i < h; i++) { for (j = 0; j < w; j++) { -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR if (_cursorFormat.bytesPerPixel > 1) { color = (*(uint32 *) srcPtr) & colormask; if (color != _mouseKeyColor) { // transparent, don't draw @@ -1624,7 +1624,7 @@ void OSystem_SDL::blitCursor() { } dstPtr += 2; srcPtr++; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR } #endif } diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index b6b46af9d7..7c1107582b 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -222,7 +222,7 @@ OSystem_SDL::OSystem_SDL() _osdSurface(0), _osdAlpha(SDL_ALPHA_TRANSPARENT), _osdFadeStartTime(0), #endif _hwscreen(0), _screen(0), _tmpscreen(0), -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR _screenFormat(Graphics::PixelFormat::createFormatCLUT8()), _cursorFormat(Graphics::PixelFormat::createFormatCLUT8()), #endif diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 09213ad417..3da9a433b7 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -93,7 +93,7 @@ public: void beginGFXTransaction(void); TransactionError endGFXTransaction(void); -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR // Game screen virtual Graphics::PixelFormat getScreenFormat() const { return _screenFormat; } @@ -248,7 +248,7 @@ protected: // unseen game screen SDL_Surface *_screen; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR Graphics::PixelFormat _screenFormat; Graphics::PixelFormat _cursorFormat; #endif @@ -285,7 +285,7 @@ protected: bool needHotswap; bool needUpdatescreen; bool normal1xScaler; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR bool formatChanged; #endif }; @@ -304,7 +304,7 @@ protected: int screenWidth, screenHeight; int overlayWidth, overlayHeight; int hardwareWidth, hardwareHeight; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR Graphics::PixelFormat format; #endif }; diff --git a/base/version.cpp b/base/version.cpp index 3d1ab783d0..ad74c64265 100644 --- a/base/version.cpp +++ b/base/version.cpp @@ -86,7 +86,7 @@ const char *gScummVMFeatures = "" "ALSA " #endif -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR "RGB " #endif diff --git a/common/system.h b/common/system.h index 0f265ea2be..f4704f5e0e 100644 --- a/common/system.h +++ b/common/system.h @@ -31,7 +31,7 @@ #include "common/rect.h" #include "graphics/pixelformat.h" -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR #include "graphics/conversion.h" #endif @@ -350,7 +350,7 @@ public: */ virtual int getGraphicsMode() const = 0; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR /** * Determine the pixel format currently in use for screen rendering. * @return the active screen pixel format. diff --git a/configure b/configure index 061089361b..5b5c62bfb9 100755 --- a/configure +++ b/configure @@ -1669,7 +1669,12 @@ add_to_config_mk_if_yes "$_mt32emu" 'USE_MT32EMU = 1' # # Check whether 16bit color support is requested # -add_to_config_mk_if_yes "$_16bit" 'ENABLE_RGB_COLOR = 1' +if test "$_16bit" = no ; then + _def_16bit='#undef USE_RGB_COLOR' +else + _def_16bit='#define USE_RGB_COLOR' +fi +add_to_config_mk_if_yes "$_16bit" 'USE_RGB_COLOR = 1' # # Check whether to enable the (hq) scalers @@ -2260,6 +2265,7 @@ $_def_readline /* Options */ $_def_text_console $_def_mt32emu +$_def_16bit /* Plugin settings */ $_def_plugin diff --git a/dists/msvc8/ScummVM_Global.vsprops b/dists/msvc8/ScummVM_Global.vsprops index 4da6748645..1fafddbb46 100644 --- a/dists/msvc8/ScummVM_Global.vsprops +++ b/dists/msvc8/ScummVM_Global.vsprops @@ -10,7 +10,7 @@ Name="VCCLCompilerTool" DisableSpecificWarnings="4068;4100;4103;4121;4127;4189;4201;4221;4244;4250;4310;4351;4355;4510;4511;4512;4610;4701;4702;4706;4800;4996" AdditionalIncludeDirectories="../..;../../engines" - PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE;;ENABLE_RGB_COLOR" + PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;USE_RGB_COLOR;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE" ExceptionHandling="0" RuntimeTypeInfo="false" WarningLevel="4" diff --git a/dists/msvc9/ScummVM_Global.vsprops b/dists/msvc9/ScummVM_Global.vsprops index 039722e157..1fafddbb46 100644 --- a/dists/msvc9/ScummVM_Global.vsprops +++ b/dists/msvc9/ScummVM_Global.vsprops @@ -10,7 +10,7 @@ Name="VCCLCompilerTool" DisableSpecificWarnings="4068;4100;4103;4121;4127;4189;4201;4221;4244;4250;4310;4351;4355;4510;4511;4512;4610;4701;4702;4706;4800;4996" AdditionalIncludeDirectories="../..;../../engines" - PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE;ENABLE_RGB_COLOR" + PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;USE_RGB_COLOR;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE" ExceptionHandling="0" RuntimeTypeInfo="false" WarningLevel="4" diff --git a/engines/engine.cpp b/engines/engine.cpp index eb46add82f..a64a2fd1f3 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -130,7 +130,7 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics: g_system->beginGFXTransaction(); initCommonGFX(defaultTo1xScaler); -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR if (format) g_system->initSize(width, height, format); else { @@ -160,7 +160,7 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics: } // Just show warnings then these occur: -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR if (gfxError & OSystem::kTransactionFormatNotSupported) { Common::String message = "Could not initialize color format."; diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index 538b1b7111..3ff852934d 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -31,7 +31,7 @@ #include "graphics/jpeg.h" -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR // Required for the YUV to RGB conversion #include "graphics/conversion.h" #endif @@ -169,14 +169,14 @@ void ROQPlayer::buildShowBuf() { // Just use the luminancy component *out = *in; #endif // DITHER -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR } else { // Do the format conversion (YUV -> RGB -> Screen format) byte r, g, b; Graphics::YUV2RGB(*in, *(in + 1), *(in + 2), r, g, b); // FIXME: this is fixed to 16bit *(uint16 *)out = (uint16)_vm->_pixelFormat.RGBToColor(r, g, b); -#endif // ENABLE_RGB_COLOR +#endif // USE_RGB_COLOR } // Skip to the next pixel diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 0db80726be..3f148f54e7 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -112,7 +112,7 @@ SciEngine::~SciEngine() { Common::Error SciEngine::run() { Graphics::PixelFormat gfxmode; -#if 0 && defined(ENABLE_RGB_COLOR) +#if 0 && defined(USE_RGB_COLOR) initGraphics(320, 200, false, NULL); #else initGraphics(320, 200, false); diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index 66ac68bd95..7818d6a98e 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_RGB_COLOR +#ifdef USE_RGB_COLOR Graphics::PixelFormat format = _system->getScreenFormat(); CursorMan.replaceCursor(_grabbedCursor, _cursor.width, _cursor.height, _cursor.hotspotX, _cursor.hotspotY, diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h index 01bd0446ff..c9af022af5 100644 --- a/engines/scumm/detection_tables.h +++ b/engines/scumm/detection_tables.h @@ -80,7 +80,7 @@ static const PlainGameDescriptor gameDescriptions[] = { { "puttputt", "Putt-Putt Joins the Parade" }, #ifdef ENABLE_HE -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR { "arttime", "Blue's Art Time Activities" }, { "baseball2001", "Backyard Baseball 2001" }, { "Baseball2003", "Backyard Baseball 2003" }, @@ -502,7 +502,7 @@ static const GameFilenamePattern gameFilenamesTable[] = { { "puttputt", "Putt-Putt", kGenHEMacNoParens, UNK_LANG, Common::kPlatformMacintosh, 0 }, #ifdef ENABLE_HE -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR { "arttime", "arttime", kGenHEPC, UNK_LANG, UNK, 0 }, { "arttime", "Blues-ArtTime", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 }, { "arttime", "artdemo", kGenHEPC, UNK_LANG, UNK, 0 }, diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 1beda85456..9f3ebb8053 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1100,7 +1100,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_RGB_COLOR +#ifdef USE_RGB_COLOR Graphics::PixelFormat format = Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0); initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, &format); if (format != _system->getScreenFormat()) diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp index b77aac37cf..0834760861 100644 --- a/graphics/cursorman.cpp +++ b/graphics/cursorman.cpp @@ -109,7 +109,7 @@ void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX, Cursor *cur = _cursorStack.top(); -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR uint size; if (!format) size = w * h; @@ -134,7 +134,7 @@ void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX, cur->_hotspotY = hotspotY; cur->_keycolor = keycolor; cur->_targetScale = targetScale; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR if (format) cur->_format = *format; else diff --git a/graphics/cursorman.h b/graphics/cursorman.h index ae7008f54c..f5b60d76b9 100644 --- a/graphics/cursorman.h +++ b/graphics/cursorman.h @@ -29,7 +29,7 @@ #include "common/stack.h" #include "common/singleton.h" #include "graphics/pixelformat.h" -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR #include "common/system.h" #endif @@ -179,7 +179,7 @@ private: uint _size; Cursor(const byte *data, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int targetScale = 1, const Graphics::PixelFormat *format = NULL) { -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR if (!format) _format = Graphics::PixelFormat::createFormatCLUT8(); else diff --git a/graphics/pixelformat.h b/graphics/pixelformat.h index d16de51ea7..b94ef41412 100644 --- a/graphics/pixelformat.h +++ b/graphics/pixelformat.h @@ -157,7 +157,7 @@ struct PixelFormat { * or PixelFormat::createFormatCLUT8() if no matching formats were found. */ inline PixelFormat findCompatibleFormat(Common::List backend, Common::List frontend) { -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR for (Common::List::iterator i = backend.begin(); i != backend.end(); ++i) { for (Common::List::iterator j = frontend.begin(); j != frontend.end(); ++j) { if (*i == *j) diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 417a1f714c..41447d2a88 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -1234,7 +1234,7 @@ bool ThemeEngine::createCursor(const Common::String &filename, int hotspotX, int if (!cursor) return false; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR _cursorFormat.bytesPerPixel = 1; _cursorFormat.rLoss = _cursorFormat.gLoss = _cursorFormat.bLoss = _cursorFormat.aLoss = 8; _cursorFormat.rShift = _cursorFormat.gShift = _cursorFormat.bShift = _cursorFormat.aShift = 0; diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index 43e227d5fb..9e4bff5075 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -612,7 +612,7 @@ protected: ImagesMap _bitmaps; Graphics::PixelFormat _overlayFormat; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR Graphics::PixelFormat _cursorFormat; #endif -- cgit v1.2.3