diff options
author | Travis Howell | 2009-11-22 11:43:12 +0000 |
---|---|---|
committer | Travis Howell | 2009-11-22 11:43:12 +0000 |
commit | bb0c7657316942859a7a8575236320cf819d07c6 (patch) | |
tree | 2636599815e0fedc9c0567cad31ada8395242f08 /engines/scumm/gfx.cpp | |
parent | 6c2cc3e1bbc626f671432fa0a37d6317222caa5d (diff) | |
download | scummvm-rg350-bb0c7657316942859a7a8575236320cf819d07c6.tar.gz scummvm-rg350-bb0c7657316942859a7a8575236320cf819d07c6.tar.bz2 scummvm-rg350-bb0c7657316942859a7a8575236320cf819d07c6.zip |
Exclude Loom PCE engine specific code, from non-16bit color build.
svn-id: r46080
Diffstat (limited to 'engines/scumm/gfx.cpp')
-rw-r--r-- | engines/scumm/gfx.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index 2d284e8e7c..8a6a831258 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -220,6 +220,7 @@ GdiNES::GdiNES(ScummEngine *vm) : Gdi(vm) { memset(&_NES, 0, sizeof(_NES)); } +#ifdef USE_RGB_COLOR GdiPCEngine::GdiPCEngine(ScummEngine *vm) : Gdi(vm) { memset(&_PCE, 0, sizeof(_PCE)); } @@ -229,6 +230,7 @@ GdiPCEngine::~GdiPCEngine() { free(_PCE.staffTiles); free(_PCE.masks); } +#endif GdiV1::GdiV1(ScummEngine *vm) : Gdi(vm) { memset(&_C64, 0, sizeof(_C64)); @@ -242,8 +244,10 @@ GdiV2::~GdiV2() { free(_roomStrips); } +#ifdef USE_RGB_COLOR Gdi16Bit::Gdi16Bit(ScummEngine *vm) : Gdi(vm) { } +#endif void Gdi::init() { _numStrips = _vm->_screenWidth / 8; @@ -269,16 +273,20 @@ void GdiNES::roomChanged(byte *roomptr) { decodeNESGfx(roomptr); } +#ifdef USE_RGB_COLOR void GdiPCEngine::roomChanged(byte *roomptr) { decodePCEngineGfx(roomptr); } +#endif void Gdi::loadTiles(byte *roomptr) { } +#ifdef USE_RGB_COLOR void GdiPCEngine::loadTiles(byte *roomptr) { decodePCEngineTileData(_vm->findResourceData(MKID_BE('TILE'), roomptr)); } +#endif void GdiV1::roomChanged(byte *roomptr) { for (int i = 0; i < 4; i++){ @@ -1457,6 +1465,7 @@ void GdiNES::prepareDrawBitmap(const byte *ptr, VirtScreen *vs, } } +#ifdef USE_RGB_COLOR void GdiPCEngine::prepareDrawBitmap(const byte *ptr, VirtScreen *vs, const int x, const int y, const int width, const int height, int stripnr, int numstrip) { @@ -1464,6 +1473,7 @@ void GdiPCEngine::prepareDrawBitmap(const byte *ptr, VirtScreen *vs, decodePCEngineObject(ptr, x - stripnr, y, width, height); } } +#endif void GdiV2::prepareDrawBitmap(const byte *ptr, VirtScreen *vs, const int x, const int y, const int width, const int height, @@ -1808,12 +1818,14 @@ bool GdiNES::drawStrip(byte *dstPtr, VirtScreen *vs, int x, int y, const int wid return false; } +#ifdef USE_RGB_COLOR bool GdiPCEngine::drawStrip(byte *dstPtr, VirtScreen *vs, int x, int y, const int width, const int height, int stripnr, const byte *smap_ptr) { byte *mask_ptr = getMaskBuffer(x, y, 1); drawStripPCEngine(dstPtr, mask_ptr, vs->pitch, stripnr, y, height); return false; } +#endif bool GdiV1::drawStrip(byte *dstPtr, VirtScreen *vs, int x, int y, const int width, const int height, int stripnr, const byte *smap_ptr) { @@ -1914,12 +1926,14 @@ void GdiNES::decodeMask(int x, int y, const int width, const int height, drawStripNESMask(mask_ptr, stripnr, y, height); } +#ifdef USE_RGB_COLOR void GdiPCEngine::decodeMask(int x, int y, const int width, const int height, int stripnr, int numzbuf, const byte *zplane_list[9], bool transpStrip, byte flag, const byte *tmsk_ptr) { byte *mask_ptr = getMaskBuffer(x, y, 1); drawStripPCEngineMask(mask_ptr, stripnr, y, height); } +#endif void GdiV1::decodeMask(int x, int y, const int width, const int height, int stripnr, int numzbuf, const byte *zplane_list[9], @@ -2623,6 +2637,7 @@ void GdiNES::drawStripNESMask(byte *dst, int stripnr, int top, int height) const } } +#ifdef USE_RGB_COLOR void readOffsetTable(const byte *ptr, uint16 **table, int *count) { int pos = 0; *count = READ_LE_UINT16(ptr) / 2 + 1; @@ -2940,6 +2955,7 @@ void GdiPCEngine::drawStripPCEngineMask(byte *dst, int stripnr, int top, int hei } } } +#endif void GdiV1::drawStripC64Background(byte *dst, int dstPitch, int stripnr, int height) { int charIdx; @@ -3558,9 +3574,11 @@ void Gdi::unkDecode11(byte *dst, int dstPitch, const byte *src, int height) cons #undef NEXT_ROW #undef READ_BIT_256 +#ifdef USE_RGB_COLOR void Gdi16Bit::writeRoomColor(byte *dst, byte color) const { WRITE_UINT16(dst, READ_LE_UINT16(_vm->_hePalettes + 2048 + color * 2)); } +#endif void Gdi::writeRoomColor(byte *dst, byte color) const { // As described in bug #1294513 "FOA/Amiga: Palette problem (Regression)" |