diff options
| author | Max Horn | 2006-09-18 19:58:22 +0000 |
|---|---|---|
| committer | Max Horn | 2006-09-18 19:58:22 +0000 |
| commit | a0e1a986471436709cdafe7ef5af27ab3f9ab26e (patch) | |
| tree | 6145608fe76e9006a9c4663dec8e61a4ae5bb5ed | |
| parent | 06ddd876a5b1d76641740a0fadd4c1a5e88c3627 (diff) | |
| download | scummvm-rg350-a0e1a986471436709cdafe7ef5af27ab3f9ab26e.tar.gz scummvm-rg350-a0e1a986471436709cdafe7ef5af27ab3f9ab26e.tar.bz2 scummvm-rg350-a0e1a986471436709cdafe7ef5af27ab3f9ab26e.zip | |
Oops, accidentally broke TMSK support for HE 72+ games
svn-id: r23933
| -rw-r--r-- | engines/scumm/gfx.cpp | 6 | ||||
| -rw-r--r-- | engines/scumm/gfx.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index 1de8a7ad08..7dfd91bd59 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -1554,7 +1554,7 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi if (_vm->_game.version == 8 || _vm->_game.heversion >= 60) transpStrip = true; - decodeMask(x, y, width, height, stripnr, numzbuf, zplane_list, transpStrip, flag); + decodeMask(x, y, width, height, stripnr, numzbuf, zplane_list, transpStrip, flag, tmsk_ptr); #if 0 // HACK: blit mask(s) onto normal screen. Useful to debug masking @@ -1626,13 +1626,11 @@ bool Gdi::drawStrip(byte *dstPtr, VirtScreen *vs, int x, int y, const int width, void Gdi::decodeMask(int x, int y, const int width, const int height, int stripnr, int numzbuf, const byte *zplane_list[9], - bool transpStrip, byte flag) { + bool transpStrip, byte flag, const byte *tmsk_ptr) { int i; byte *mask_ptr; const byte *z_plane_ptr; - const byte *tmsk_ptr = NULL; // FIXME - if (_vm->_game.version <= 1) { mask_ptr = getMaskBuffer(x, y, 1); if (_vm->_game.platform == Common::kPlatformNES) { diff --git a/engines/scumm/gfx.h b/engines/scumm/gfx.h index ffbab7ddca..8663acf99a 100644 --- a/engines/scumm/gfx.h +++ b/engines/scumm/gfx.h @@ -273,7 +273,7 @@ protected: virtual void decodeMask(int x, int y, const int width, const int height, int stripnr, int numzbuf, const byte *zplane_list[9], - bool transpStrip, byte flag); + bool transpStrip, byte flag, const byte *tmsk_ptr); public: void init(); |