From 5d4fd2e1540ae9ced60b68c3253d3b5b04254403 Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Mon, 13 Jan 2014 19:05:07 -0500 Subject: GROOVIE: Remove groovie2 8bpp mode It didn't work properly, it's not what the original did, and spooky mode needs to be implemented completely differently --- engines/groovie/roq.cpp | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) (limited to 'engines/groovie/roq.cpp') diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index 2776a0455d..5eebc6a6bb 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -50,19 +50,6 @@ ROQPlayer::ROQPlayer(GroovieEngine *vm) : // Create the work surfaces _currBuf = new Graphics::Surface(); _prevBuf = new Graphics::Surface(); - - if (_vm->_mode8bit) { - byte pal[256 * 3]; - - // Set a grayscale palette - for (int i = 0; i < 256; i++) { - pal[(i * 3) + 0] = i; - pal[(i * 3) + 1] = i; - pal[(i * 3) + 2] = i; - } - - _syst->getPaletteManager()->setPalette(pal, 0, 256); - } } ROQPlayer::~ROQPlayer() { @@ -118,18 +105,11 @@ void ROQPlayer::buildShowBuf() { byte *out = (byte *)_bg->getBasePtr(0, line); byte *in = (byte *)_currBuf->getBasePtr(0, line / _scaleY); for (int x = 0; x < _bg->w; x++) { - if (_vm->_mode8bit) { - // Just use the luminancy component - *out = *in; -#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 // USE_RGB_COLOR - } + // 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 = _vm->_pixelFormat.RGBToColor(r, g, b); // Skip to the next pixel out += _vm->_pixelFormat.bytesPerPixel; -- cgit v1.2.3