diff options
| -rw-r--r-- | engines/groovie/groovie.cpp | 2 | ||||
| -rw-r--r-- | engines/groovie/groovie.h | 2 | ||||
| -rw-r--r-- | engines/groovie/roq.cpp | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index 5d89799648..c1826e12ce 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -72,7 +72,7 @@ Common::Error GroovieEngine::run() { // Initialize the graphics switch (_gameDescription->version) { case kGroovieV2: -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR _pixelFormat = _system->getBestFormat(); initGraphics(640, 480, true, _pixelFormat); break; diff --git a/engines/groovie/groovie.h b/engines/groovie/groovie.h index adc6986a87..3f7f7cb0ed 100644 --- a/engines/groovie/groovie.h +++ b/engines/groovie/groovie.h @@ -85,7 +85,7 @@ protected: public: void waitForInput(); -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR Graphics::PixelFormat _pixelFormat; #endif Script _script; diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index 95acb64f6a..56237655e9 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -29,7 +29,7 @@ #include "groovie/groovie.h" #include "groovie/roq.h" -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR // Required for the YUV to RGB conversion #include "graphics/dither.h" #endif @@ -47,7 +47,7 @@ ROQPlayer::ROQPlayer(GroovieEngine *vm) : _currBuf = new Graphics::Surface(); _prevBuf = new Graphics::Surface(); -#ifndef ENABLE_16BIT +#ifndef ENABLE_RGB_COLOR byte pal[256 * 4]; #ifdef DITHER byte pal3[256 * 3]; @@ -92,7 +92,7 @@ ROQPlayer::ROQPlayer(GroovieEngine *vm) : #endif // DITHER _syst->setPalette(pal, 0, 256); -#endif // !ENABLE_16BIT +#endif // !ENABLE_RGB_COLOR } ROQPlayer::~ROQPlayer() { @@ -160,7 +160,7 @@ void ROQPlayer::buildShowBuf() { byte *out = (byte *)_showBuf.getBasePtr(0, line); byte *in = (byte *)_prevBuf->getBasePtr(0, line / _scaleY); for (int x = 0; x < _showBuf.w; x++) { -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR // Do the format conversion (YUV -> RGB -> Screen format) byte r, g, b; Graphics::PaletteLUT::YUV2RGB(*in, *(in + 1), *(in + 2), r, g, b); @@ -169,7 +169,7 @@ void ROQPlayer::buildShowBuf() { // Skip to the next pixel out += _vm->_pixelFormat.bytesPerPixel; -#else // !ENABLE_16BIT +#else // !ENABLE_RGB_COLOR #ifdef DITHER *out = _dither->dither(*in, *(in + 1), *(in + 2), x); #else @@ -178,7 +178,7 @@ void ROQPlayer::buildShowBuf() { #endif // DITHER // Skip to the next pixel out++; -#endif // ENABLE_16BIT +#endif // ENABLE_RGB_COLOR if (!(x % _scaleX)) in += _prevBuf->bytesPerPixel; @@ -335,7 +335,7 @@ bool ROQPlayer::processBlockInfo(ROQBlockHeader &blockHeader) { // Allocate new buffers _currBuf->create(width, height, 3); _prevBuf->create(width, height, 3); -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR _showBuf.create(width * _scaleX, height * _scaleY, _vm->_pixelFormat.bytesPerPixel); #else _showBuf.create(width * _scaleX, height * _scaleY, 1); |