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 /engines/scumm | |
| 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 'engines/scumm')
| -rw-r--r-- | engines/scumm/cursor.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/detection_tables.h | 4 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
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()) |