diff options
| author | Andre Heider | 2009-08-21 18:16:37 +0000 |
|---|---|---|
| committer | Andre Heider | 2009-08-21 18:16:37 +0000 |
| commit | 007f68366fd55a519753bf533c7c3a80db3754f0 (patch) | |
| tree | d25cade63a148fdd6b2190151e8e1f5c87a73ef3 /graphics | |
| parent | c0d954334547c166b52b37199ad877bc7e5ac2b0 (diff) | |
| download | scummvm-rg350-007f68366fd55a519753bf533c7c3a80db3754f0.tar.gz scummvm-rg350-007f68366fd55a519753bf533c7c3a80db3754f0.tar.bz2 scummvm-rg350-007f68366fd55a519753bf533c7c3a80db3754f0.zip | |
Renamed ENABLE_RGB_COLOR to USE_RGB_COLOR, and added it to config.h to guarantee a consistent build.
svn-id: r43604
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/cursorman.cpp | 4 | ||||
| -rw-r--r-- | graphics/cursorman.h | 4 | ||||
| -rw-r--r-- | graphics/pixelformat.h | 2 |
3 files changed, 5 insertions, 5 deletions
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<PixelFormat> backend, Common::List<PixelFormat> frontend) { -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR for (Common::List<PixelFormat>::iterator i = backend.begin(); i != backend.end(); ++i) { for (Common::List<PixelFormat>::iterator j = frontend.begin(); j != frontend.end(); ++j) { if (*i == *j) |