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 /backends/platform/gp2x | |
| 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 'backends/platform/gp2x')
| -rw-r--r-- | backends/platform/gp2x/graphics.cpp | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/backends/platform/gp2x/graphics.cpp b/backends/platform/gp2x/graphics.cpp index d948cb82d3..cf874323e0 100644 --- a/backends/platform/gp2x/graphics.cpp +++ b/backends/platform/gp2x/graphics.cpp @@ -243,7 +243,7 @@ int OSystem_GP2X::getGraphicsMode() const {  void OSystem_GP2X::initSize(uint w, uint h, const Graphics::PixelFormat *format) {  	assert(_transactionMode == kTransactionActive); -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR  	//avoid redundant format changes  	Graphics::PixelFormat newFormat;  	if (!format) @@ -1231,7 +1231,7 @@ void OSystem_GP2X::warpMouse(int x, int y) {  }  void OSystem_GP2X::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) { -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR  	if (!format)  		_cursorFormat = Graphics::PixelFormat::createFormatCLUT8();  	else if (format->bytesPerPixel <= _screenFormat.bytesPerPixel) @@ -1274,7 +1274,7 @@ void OSystem_GP2X::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x  	}  	free(_mouseData); -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR  	_mouseData = (byte *)malloc(w * h * _cursorFormat.bytesPerPixel);  	memcpy(_mouseData, buf, w * h * _cursorFormat.bytesPerPixel);  #else @@ -1288,7 +1288,7 @@ void OSystem_GP2X::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x  void OSystem_GP2X::blitCursor() {  	byte *dstPtr;  	const byte *srcPtr = _mouseData; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR  	uint32 color;  	uint32 colormask = (1 << (_cursorFormat.bytesPerPixel << 3)) - 1;  #else @@ -1327,7 +1327,7 @@ void OSystem_GP2X::blitCursor() {  	for (i = 0; i < h; i++) {  		for (j = 0; j < w; j++) { -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR  			if (_cursorFormat.bytesPerPixel > 1) {  				color = (*(uint32 *) srcPtr) & colormask;  				if (color != _mouseKeyColor) {	// transparent, don't draw @@ -1347,7 +1347,7 @@ void OSystem_GP2X::blitCursor() {  				}  				dstPtr += 2;  				srcPtr++; -#ifdef ENABLE_RGB_COLOR +#ifdef USE_RGB_COLOR  			}  #endif  		} | 
