[Scummvm-cvs-logs] SF.net SVN: scummvm:[41817] scummvm/branches/gsoc2009-16bit/engines/groovie

[mthreepwood at users.sourceforge.net]

Revision: 41817
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41817&view=rev
Author:   mthreepwood
Date:     2009-06-23 20:46:38 +0000 (Tue, 23 Jun 2009)

Log Message:
-----------
ENABLE_16BIT has been renamed to ENABLE_RGB_COLOR as of r41696, so make sure the Groovie engine uses that too

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/engines/groovie/groovie.cpp
    scummvm/branches/gsoc2009-16bit/engines/groovie/groovie.h
    scummvm/branches/gsoc2009-16bit/engines/groovie/roq.cpp

Modified: scummvm/branches/gsoc2009-16bit/engines/groovie/groovie.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/groovie/groovie.cpp	2009-06-23 18:37:10 UTC (rev 41816)
+++ scummvm/branches/gsoc2009-16bit/engines/groovie/groovie.cpp	2009-06-23 20:46:38 UTC (rev 41817)
@@ -72,7 +72,7 @@
 	// Initialize the graphics
 	switch (_gameDescription->version) {
 	case kGroovieV2:
-#ifdef ENABLE_16BIT
+#ifdef ENABLE_RGB_COLOR
 		_pixelFormat = _system->getBestFormat();
 		initGraphics(640, 480, true, _pixelFormat);
 		break;

Modified: scummvm/branches/gsoc2009-16bit/engines/groovie/groovie.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/groovie/groovie.h	2009-06-23 18:37:10 UTC (rev 41816)
+++ scummvm/branches/gsoc2009-16bit/engines/groovie/groovie.h	2009-06-23 20:46:38 UTC (rev 41817)
@@ -85,7 +85,7 @@
 public:
 	void waitForInput();
 
-#ifdef ENABLE_16BIT
+#ifdef ENABLE_RGB_COLOR
 	Graphics::PixelFormat _pixelFormat;
 #endif
 	Script _script;

Modified: scummvm/branches/gsoc2009-16bit/engines/groovie/roq.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/groovie/roq.cpp	2009-06-23 18:37:10 UTC (rev 41816)
+++ scummvm/branches/gsoc2009-16bit/engines/groovie/roq.cpp	2009-06-23 20:46:38 UTC (rev 41817)
@@ -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 @@
 	_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 @@
 #endif // DITHER
 
 	_syst->setPalette(pal, 0, 256);
-#endif // !ENABLE_16BIT
+#endif // !ENABLE_RGB_COLOR
 }
 
 ROQPlayer::~ROQPlayer() {
@@ -160,7 +160,7 @@
 		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 @@
 			
 			// 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 @@
 #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 @@
 		// 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.