aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2009-06-05 10:13:19 +0000
committerTravis Howell2009-06-05 10:13:19 +0000
commitccee18a489ece14c499c4e0c43aeb7fc216451fb (patch)
tree09036d564bb5ae07798c97e9eb1c8d6071351f07
parent9789ba7f28d2c0a093adda01435306f28e91fede (diff)
downloadscummvm-rg350-ccee18a489ece14c499c4e0c43aeb7fc216451fb.tar.gz
scummvm-rg350-ccee18a489ece14c499c4e0c43aeb7fc216451fb.tar.bz2
scummvm-rg350-ccee18a489ece14c499c4e0c43aeb7fc216451fb.zip
Cleanup.
svn-id: r41195
-rw-r--r--engines/scumm/gfx.cpp59
-rw-r--r--engines/scumm/gfx.h8
-rw-r--r--engines/scumm/scumm.cpp4
3 files changed, 34 insertions, 37 deletions
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 0427e32326..d47301c974 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -231,6 +231,9 @@ GdiV2::~GdiV2() {
free(_roomStrips);
}
+Gdi16Bit::Gdi16Bit(ScummEngine *vm) : Gdi(vm) {
+}
+
void Gdi::init() {
_numStrips = _vm->_screenWidth / 8;
@@ -2803,12 +2806,8 @@ void Gdi::drawStripHE(byte *dst, int dstPitch, const byte *src, int width, int h
int x = width;
while (1) {
- if (!transpCheck || color != _transparentColor) {
- if (_vm->_game.features & GF_16BIT_COLOR)
- WRITE_UINT16(dst, READ_LE_UINT16(_vm->_hePalettes + 2048 + color * 2));
- else
- *dst = _roomPalette[color];
- }
+ if (!transpCheck || color != _transparentColor)
+ writeRoomColor(dst, color);
dst += _vm->_bitDepth;
--x;
if (x == 0) {
@@ -2896,12 +2895,8 @@ void Gdi::drawStripComplex(byte *dst, int dstPitch, const byte *src, int height,
int x = 8;
do {
FILL_BITS;
- if (!transpCheck || color != _transparentColor) {
- if (_vm->_game.features & GF_16BIT_COLOR)
- WRITE_UINT16(dst, READ_LE_UINT16(_vm->_hePalettes + 2048 + color * 2));
- else
- *dst = _roomPalette[color] + _paletteMod;
- }
+ if (!transpCheck || color != _transparentColor)
+ writeRoomColor(dst, color);
dst += _vm->_bitDepth;
againPos:
@@ -2927,12 +2922,8 @@ void Gdi::drawStripComplex(byte *dst, int dstPitch, const byte *src, int height,
if (!--height)
return;
}
- if (!transpCheck || color != _transparentColor) {
- if (_vm->_game.features & GF_16BIT_COLOR)
- WRITE_UINT16(dst, READ_LE_UINT16(_vm->_hePalettes + 2048 + color * 2));
- else
- *dst = _roomPalette[color] + _paletteMod;
- }
+ if (!transpCheck || color != _transparentColor)
+ writeRoomColor(dst, color);
dst += _vm->_bitDepth;
} while (--reps);
bits >>= 8;
@@ -2956,12 +2947,8 @@ void Gdi::drawStripBasicH(byte *dst, int dstPitch, const byte *src, int height,
int x = 8;
do {
FILL_BITS;
- if (!transpCheck || color != _transparentColor) {
- if (_vm->_game.features & GF_16BIT_COLOR)
- WRITE_UINT16(dst, READ_LE_UINT16(_vm->_hePalettes + 2048 + color * 2));
- else
- *dst = _roomPalette[color] + _paletteMod;
- }
+ if (!transpCheck || color != _transparentColor)
+ writeRoomColor(dst, color);
dst += _vm->_bitDepth;
if (!READ_BIT) {
} else if (!READ_BIT) {
@@ -2993,12 +2980,8 @@ void Gdi::drawStripBasicV(byte *dst, int dstPitch, const byte *src, int height,
int h = height;
do {
FILL_BITS;
- if (!transpCheck || color != _transparentColor) {
- if (_vm->_game.features & GF_16BIT_COLOR)
- WRITE_UINT16(dst, READ_LE_UINT16(_vm->_hePalettes + 2048 + color * 2));
- else
- *dst = _roomPalette[color] + _paletteMod;
- }
+ if (!transpCheck || color != _transparentColor)
+ writeRoomColor(dst, color);
dst += dstPitch;
if (!READ_BIT) {
} else if (!READ_BIT) {
@@ -3065,12 +3048,8 @@ void Gdi::drawStripRaw(byte *dst, int dstPitch, const byte *src, int height, con
do {
for (x = 0; x < 8; x ++) {
byte color = *src++;
- if (!transpCheck || color != _transparentColor) {
- if (_vm->_game.features & GF_16BIT_COLOR)
- WRITE_UINT16(dst + x * 2, READ_LE_UINT16(_vm->_hePalettes + 2048 + color * 2));
- else
- dst[x] = _roomPalette[color] + _paletteMod;
- }
+ if (!transpCheck || color != _transparentColor)
+ writeRoomColor(dst + x * _vm->_bitDepth, color);
}
dst += dstPitch;
} while (--height);
@@ -3193,6 +3172,14 @@ void Gdi::unkDecode11(byte *dst, int dstPitch, const byte *src, int height) cons
#undef NEXT_ROW
#undef READ_BIT_256
+void Gdi16Bit::writeRoomColor(byte *dst, byte color) const {
+ WRITE_UINT16(dst, READ_LE_UINT16(_vm->_hePalettes + 2048 + color * 2));
+}
+
+void Gdi::writeRoomColor(byte *dst, byte color) const {
+ *dst = _roomPalette[color] + _paletteMod;
+}
+
#pragma mark -
#pragma mark --- Transition effects ---
diff --git a/engines/scumm/gfx.h b/engines/scumm/gfx.h
index 88852c8388..c0f2c2c083 100644
--- a/engines/scumm/gfx.h
+++ b/engines/scumm/gfx.h
@@ -215,6 +215,7 @@ protected:
void drawStrip3DO(byte *dst, int dstPitch, const byte *src, int height, const bool transpCheck) const;
void drawStripHE(byte *dst, int dstPitch, const byte *src, int width, int height, const bool transpCheck) const;
+ virtual void writeRoomColor(byte *dst, byte color) const;
/* Mask decompressors */
void decompressTMSK(byte *dst, const byte *tmsk, const byte *src, int height) const;
@@ -361,6 +362,13 @@ public:
virtual void roomChanged(byte *roomptr);
};
+class Gdi16Bit : public Gdi {
+protected:
+ virtual void writeRoomColor(byte *dst, byte color) const;
+public:
+ Gdi16Bit(ScummEngine *vm);
+};
+
} // End of namespace Scumm
#endif
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 17ffc6e5b0..022eba1e5b 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -109,7 +109,9 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
_currentScript(0xFF), // Let debug() work on init stage
_messageDialog(0), _pauseDialog(0), _scummMenuDialog(0), _versionDialog(0) {
- if (_game.platform == Common::kPlatformNES) {
+ if (_game.features & GF_16BIT_COLOR) {
+ _gdi = new Gdi16Bit(this);
+ } else if (_game.platform == Common::kPlatformNES) {
_gdi = new GdiNES(this);
} else if (_game.version <= 1) {
_gdi = new GdiV1(this);