[Scummvm-cvs-logs] SF.net SVN: scummvm:[43604] scummvm/trunk
dhewg at users.sourceforge.net
dhewg at users.sourceforge.net
Fri Aug 21 20:16:38 CEST 2009
Revision: 43604
http://scummvm.svn.sourceforge.net/scummvm/?rev=43604&view=rev
Author: dhewg
Date: 2009-08-21 18:16:37 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
Renamed ENABLE_RGB_COLOR to USE_RGB_COLOR, and added it to config.h to guarantee a consistent build.
Modified Paths:
--------------
scummvm/trunk/Makefile.common
scummvm/trunk/backends/platform/gp2x/graphics.cpp
scummvm/trunk/backends/platform/sdl/graphics.cpp
scummvm/trunk/backends/platform/sdl/sdl.cpp
scummvm/trunk/backends/platform/sdl/sdl.h
scummvm/trunk/base/version.cpp
scummvm/trunk/common/system.h
scummvm/trunk/configure
scummvm/trunk/dists/msvc8/ScummVM_Global.vsprops
scummvm/trunk/dists/msvc9/ScummVM_Global.vsprops
scummvm/trunk/engines/engine.cpp
scummvm/trunk/engines/groovie/roq.cpp
scummvm/trunk/engines/sci/sci.cpp
scummvm/trunk/engines/scumm/cursor.cpp
scummvm/trunk/engines/scumm/detection_tables.h
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/graphics/cursorman.cpp
scummvm/trunk/graphics/cursorman.h
scummvm/trunk/graphics/pixelformat.h
scummvm/trunk/gui/ThemeEngine.cpp
scummvm/trunk/gui/ThemeEngine.h
Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/Makefile.common 2009-08-21 18:16:37 UTC (rev 43604)
@@ -37,10 +37,6 @@
DEFINES += -DDISABLE_SCALERS
endif
-ifdef ENABLE_RGB_COLOR
-DEFINES += -DENABLE_RGB_COLOR
-endif
-
ifdef DISABLE_HQ_SCALERS
DEFINES += -DDISABLE_HQ_SCALERS
endif
Modified: scummvm/trunk/backends/platform/gp2x/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/graphics.cpp 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/backends/platform/gp2x/graphics.cpp 2009-08-21 18:16:37 UTC (rev 43604)
@@ -243,7 +243,7 @@
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::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 @@
}
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::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 @@
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 @@
}
dstPtr += 2;
srcPtr++;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
}
#endif
}
Modified: scummvm/trunk/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/graphics.cpp 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/backends/platform/sdl/graphics.cpp 2009-08-21 18:16:37 UTC (rev 43604)
@@ -26,7 +26,7 @@
#include "backends/platform/sdl/sdl.h"
#include "common/mutex.h"
#include "common/util.h"
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
#include "common/list.h"
#endif
#include "graphics/font.h"
@@ -100,7 +100,7 @@
_transactionDetails.needUpdatescreen = false;
_transactionDetails.normal1xScaler = false;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
_transactionDetails.formatChanged = false;
#endif
@@ -126,7 +126,7 @@
_videoMode.mode = _oldVideoMode.mode;
_videoMode.scaleFactor = _oldVideoMode.scaleFactor;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
} else if (_videoMode.format != _oldVideoMode.format) {
errors |= kTransactionFormatNotSupported;
@@ -156,7 +156,7 @@
}
}
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
if (_transactionDetails.sizeChanged || _transactionDetails.formatChanged) {
#else
if (_transactionDetails.sizeChanged) {
@@ -209,7 +209,7 @@
return (TransactionError)errors;
}
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
const Graphics::PixelFormat RGBList[] = {
#ifdef ENABLE_32BIT
// RGBA8888, ARGB8888, RGB888
@@ -442,7 +442,7 @@
void OSystem_SDL::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)
@@ -543,7 +543,7 @@
//
// Create the surface that contains the 8 bit game data
//
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
_screen = SDL_CreateRGBSurface(SDL_SWSURFACE, _videoMode.screenWidth, _videoMode.screenHeight,
_screenFormat.bytesPerPixel << 3,
((1 << _screenFormat.rBits()) - 1) << _screenFormat.rShift ,
@@ -1007,7 +1007,7 @@
if (SDL_LockSurface(_screen) == -1)
error("SDL_LockSurface failed: %s", SDL_GetError());
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
byte *dst = (byte *)_screen->pixels + y * _videoMode.screenWidth * _screenFormat.bytesPerPixel + x * _screenFormat.bytesPerPixel;
if (_videoMode.screenWidth == w && pitch == w * _screenFormat.bytesPerPixel) {
memcpy(dst, src, h*w*_screenFormat.bytesPerPixel);
@@ -1053,7 +1053,7 @@
_framebuffer.w = _screen->w;
_framebuffer.h = _screen->h;
_framebuffer.pitch = _screen->pitch;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
_framebuffer.bytesPerPixel = _screenFormat.bytesPerPixel;
#else
_framebuffer.bytesPerPixel = 1;
@@ -1241,7 +1241,7 @@
void OSystem_SDL::setPalette(const byte *colors, uint start, uint num) {
assert(colors);
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
if (_screenFormat.bytesPerPixel > 1)
return; //not using a paletted pixel format
#endif
@@ -1508,7 +1508,7 @@
}
void OSystem_SDL::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)
@@ -1551,7 +1551,7 @@
}
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
@@ -1565,7 +1565,7 @@
void OSystem_SDL::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
@@ -1604,7 +1604,7 @@
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
@@ -1624,7 +1624,7 @@
}
dstPtr += 2;
srcPtr++;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
}
#endif
}
Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp 2009-08-21 18:16:37 UTC (rev 43604)
@@ -222,7 +222,7 @@
_osdSurface(0), _osdAlpha(SDL_ALPHA_TRANSPARENT), _osdFadeStartTime(0),
#endif
_hwscreen(0), _screen(0), _tmpscreen(0),
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
_screenFormat(Graphics::PixelFormat::createFormatCLUT8()),
_cursorFormat(Graphics::PixelFormat::createFormatCLUT8()),
#endif
Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/backends/platform/sdl/sdl.h 2009-08-21 18:16:37 UTC (rev 43604)
@@ -93,7 +93,7 @@
void beginGFXTransaction(void);
TransactionError endGFXTransaction(void);
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
// Game screen
virtual Graphics::PixelFormat getScreenFormat() const { return _screenFormat; }
@@ -248,7 +248,7 @@
// unseen game screen
SDL_Surface *_screen;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
Graphics::PixelFormat _screenFormat;
Graphics::PixelFormat _cursorFormat;
#endif
@@ -285,7 +285,7 @@
bool needHotswap;
bool needUpdatescreen;
bool normal1xScaler;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
bool formatChanged;
#endif
};
@@ -304,7 +304,7 @@
int screenWidth, screenHeight;
int overlayWidth, overlayHeight;
int hardwareWidth, hardwareHeight;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
Graphics::PixelFormat format;
#endif
};
Modified: scummvm/trunk/base/version.cpp
===================================================================
--- scummvm/trunk/base/version.cpp 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/base/version.cpp 2009-08-21 18:16:37 UTC (rev 43604)
@@ -86,7 +86,7 @@
"ALSA "
#endif
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
"RGB "
#endif
Modified: scummvm/trunk/common/system.h
===================================================================
--- scummvm/trunk/common/system.h 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/common/system.h 2009-08-21 18:16:37 UTC (rev 43604)
@@ -31,7 +31,7 @@
#include "common/rect.h"
#include "graphics/pixelformat.h"
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
#include "graphics/conversion.h"
#endif
@@ -350,7 +350,7 @@
*/
virtual int getGraphicsMode() const = 0;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
/**
* Determine the pixel format currently in use for screen rendering.
* @return the active screen pixel format.
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/configure 2009-08-21 18:16:37 UTC (rev 43604)
@@ -1669,7 +1669,12 @@
#
# Check whether 16bit color support is requested
#
-add_to_config_mk_if_yes "$_16bit" 'ENABLE_RGB_COLOR = 1'
+if test "$_16bit" = no ; then
+ _def_16bit='#undef USE_RGB_COLOR'
+else
+ _def_16bit='#define USE_RGB_COLOR'
+fi
+add_to_config_mk_if_yes "$_16bit" 'USE_RGB_COLOR = 1'
#
# Check whether to enable the (hq) scalers
@@ -2260,6 +2265,7 @@
/* Options */
$_def_text_console
$_def_mt32emu
+$_def_16bit
/* Plugin settings */
$_def_plugin
Modified: scummvm/trunk/dists/msvc8/ScummVM_Global.vsprops
===================================================================
--- scummvm/trunk/dists/msvc8/ScummVM_Global.vsprops 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/dists/msvc8/ScummVM_Global.vsprops 2009-08-21 18:16:37 UTC (rev 43604)
@@ -10,7 +10,7 @@
Name="VCCLCompilerTool"
DisableSpecificWarnings="4068;4100;4103;4121;4127;4189;4201;4221;4244;4250;4310;4351;4355;4510;4511;4512;4610;4701;4702;4706;4800;4996"
AdditionalIncludeDirectories="../..;../../engines"
- PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE;;ENABLE_RGB_COLOR"
+ PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;USE_RGB_COLOR;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
ExceptionHandling="0"
RuntimeTypeInfo="false"
WarningLevel="4"
Modified: scummvm/trunk/dists/msvc9/ScummVM_Global.vsprops
===================================================================
--- scummvm/trunk/dists/msvc9/ScummVM_Global.vsprops 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/dists/msvc9/ScummVM_Global.vsprops 2009-08-21 18:16:37 UTC (rev 43604)
@@ -10,7 +10,7 @@
Name="VCCLCompilerTool"
DisableSpecificWarnings="4068;4100;4103;4121;4127;4189;4201;4221;4244;4250;4310;4351;4355;4510;4511;4512;4610;4701;4702;4706;4800;4996"
AdditionalIncludeDirectories="../..;../../engines"
- PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE;ENABLE_RGB_COLOR"
+ PreprocessorDefinitions="USE_NASM;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;USE_RGB_COLOR;ENABLE_AGI;ENABLE_AGOS;ENABLE_AGOS2;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LOL;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_IHNM;ENABLE_SAGA2;ENABLE_SCI;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL;ENABLE_TUCKER;ENABLE_GROOVIE"
ExceptionHandling="0"
RuntimeTypeInfo="false"
WarningLevel="4"
Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/engines/engine.cpp 2009-08-21 18:16:37 UTC (rev 43604)
@@ -130,7 +130,7 @@
g_system->beginGFXTransaction();
initCommonGFX(defaultTo1xScaler);
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
if (format)
g_system->initSize(width, height, format);
else {
@@ -160,7 +160,7 @@
}
// Just show warnings then these occur:
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
if (gfxError & OSystem::kTransactionFormatNotSupported) {
Common::String message = "Could not initialize color format.";
Modified: scummvm/trunk/engines/groovie/roq.cpp
===================================================================
--- scummvm/trunk/engines/groovie/roq.cpp 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/engines/groovie/roq.cpp 2009-08-21 18:16:37 UTC (rev 43604)
@@ -31,7 +31,7 @@
#include "graphics/jpeg.h"
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
// Required for the YUV to RGB conversion
#include "graphics/conversion.h"
#endif
@@ -169,14 +169,14 @@
// Just use the luminancy component
*out = *in;
#endif // DITHER
-#ifdef ENABLE_RGB_COLOR
+#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 // ENABLE_RGB_COLOR
+#endif // USE_RGB_COLOR
}
// Skip to the next pixel
Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/engines/sci/sci.cpp 2009-08-21 18:16:37 UTC (rev 43604)
@@ -112,7 +112,7 @@
Common::Error SciEngine::run() {
Graphics::PixelFormat gfxmode;
-#if 0 && defined(ENABLE_RGB_COLOR)
+#if 0 && defined(USE_RGB_COLOR)
initGraphics(320, 200, false, NULL);
#else
initGraphics(320, 200, false);
Modified: scummvm/trunk/engines/scumm/cursor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/cursor.cpp 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/engines/scumm/cursor.cpp 2009-08-21 18:16:37 UTC (rev 43604)
@@ -112,7 +112,7 @@
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,
Modified: scummvm/trunk/engines/scumm/detection_tables.h
===================================================================
--- scummvm/trunk/engines/scumm/detection_tables.h 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/engines/scumm/detection_tables.h 2009-08-21 18:16:37 UTC (rev 43604)
@@ -80,7 +80,7 @@
{ "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 @@
{ "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 },
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2009-08-21 18:16:37 UTC (rev 43604)
@@ -1100,7 +1100,7 @@
// 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())
Modified: scummvm/trunk/graphics/cursorman.cpp
===================================================================
--- scummvm/trunk/graphics/cursorman.cpp 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/graphics/cursorman.cpp 2009-08-21 18:16:37 UTC (rev 43604)
@@ -109,7 +109,7 @@
Cursor *cur = _cursorStack.top();
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
uint size;
if (!format)
size = w * h;
@@ -134,7 +134,7 @@
cur->_hotspotY = hotspotY;
cur->_keycolor = keycolor;
cur->_targetScale = targetScale;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
if (format)
cur->_format = *format;
else
Modified: scummvm/trunk/graphics/cursorman.h
===================================================================
--- scummvm/trunk/graphics/cursorman.h 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/graphics/cursorman.h 2009-08-21 18:16:37 UTC (rev 43604)
@@ -29,7 +29,7 @@
#include "common/stack.h"
#include "common/singleton.h"
#include "graphics/pixelformat.h"
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
#include "common/system.h"
#endif
@@ -179,7 +179,7 @@
uint _size;
Cursor(const byte *data, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int targetScale = 1, const Graphics::PixelFormat *format = NULL) {
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
if (!format)
_format = Graphics::PixelFormat::createFormatCLUT8();
else
Modified: scummvm/trunk/graphics/pixelformat.h
===================================================================
--- scummvm/trunk/graphics/pixelformat.h 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/graphics/pixelformat.h 2009-08-21 18:16:37 UTC (rev 43604)
@@ -157,7 +157,7 @@
* or PixelFormat::createFormatCLUT8() if no matching formats were found.
*/
inline PixelFormat findCompatibleFormat(Common::List<PixelFormat> backend, Common::List<PixelFormat> frontend) {
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
for (Common::List<PixelFormat>::iterator i = backend.begin(); i != backend.end(); ++i) {
for (Common::List<PixelFormat>::iterator j = frontend.begin(); j != frontend.end(); ++j) {
if (*i == *j)
Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/gui/ThemeEngine.cpp 2009-08-21 18:16:37 UTC (rev 43604)
@@ -1234,7 +1234,7 @@
if (!cursor)
return false;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
_cursorFormat.bytesPerPixel = 1;
_cursorFormat.rLoss = _cursorFormat.gLoss = _cursorFormat.bLoss = _cursorFormat.aLoss = 8;
_cursorFormat.rShift = _cursorFormat.gShift = _cursorFormat.bShift = _cursorFormat.aShift = 0;
Modified: scummvm/trunk/gui/ThemeEngine.h
===================================================================
--- scummvm/trunk/gui/ThemeEngine.h 2009-08-21 18:12:13 UTC (rev 43603)
+++ scummvm/trunk/gui/ThemeEngine.h 2009-08-21 18:16:37 UTC (rev 43604)
@@ -612,7 +612,7 @@
ImagesMap _bitmaps;
Graphics::PixelFormat _overlayFormat;
-#ifdef ENABLE_RGB_COLOR
+#ifdef USE_RGB_COLOR
Graphics::PixelFormat _cursorFormat;
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list