diff options
| -rw-r--r-- | scumm/costume.cpp | 10 | ||||
| -rw-r--r-- | scumm/gfx.cpp | 9 | ||||
| -rw-r--r-- | scumm/resource_v2.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp index f52bc4ef32..36b5bd9866 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -709,9 +709,9 @@ void CostumeRenderer::drawNESCostume(const Actor *a, int limb) { byte tile = ptr[1]; byte palette = (ptr[2] & 0x03) << 2; int8 x = ptr[2]; x >>= 2; + ptr += 3; - if (flipped) - { + if (flipped) { mask = (mask == 0x80) ? 0x01 : 0x80; x = -x; } @@ -742,7 +742,11 @@ void CostumeRenderer::drawNESCostume(const Actor *a, int limb) { if (bottom < _actorY + y + 8) bottom = _actorY + y + 8; } - _vm->markRectAsDirty(kMainVirtScreen,left,right,top,bottom); + + _draw_top = top; + _draw_bottom = bottom; + + _vm->markRectAsDirty(kMainVirtScreen, left, right, top, bottom, _actorID); } byte CostumeRenderer::drawLimb(const Actor *a, int limb) { diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 87eec6ba91..b3807d85fe 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -1424,10 +1424,11 @@ void Gdi::drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int wi if (_vm->_version == 1) { if (_vm->_features & GF_NES) { //mask_ptr = getMaskBuffer(x, y, 1); - for (int ii = 0; ii < height; ii++) { - // *mask_ptr = ? // what sort of data needs to go into the mask? - //mask_ptr += _numStrips; - } + //for (int ii = 0; ii < height; ii++) { + // for (int jj = 0; jj < width; jj++) + // mask_ptr[jj] = 0xff; + // mask_ptr += _numStrips; + //} } else { mask_ptr = getMaskBuffer(x, y, 1); drawStripC64Mask(mask_ptr, stripnr, width, height); diff --git a/scumm/resource_v2.cpp b/scumm/resource_v2.cpp index 64030a6a84..fbc4d3d392 100644 --- a/scumm/resource_v2.cpp +++ b/scumm/resource_v2.cpp @@ -173,7 +173,7 @@ void ScummEngine_v2::readIndexFile() { break; case 0x4643: if (!(_features & GF_NES)) - error("Use maniacnes target"); + error("Use maniac target"); printf("NES V1 game detected\n"); _version = 1; readClassicIndexFile(); diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index a622bb9142..890d03ecb0 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -418,6 +418,8 @@ static const ScummGameSettings multiple_versions_md5_settings[] = { GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0}, {"51305e929e330e24a75a0351c8f9975e", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Updated)", GID_HEGAME, 6, 99, 30, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0}, + {"545432361b874eebe6bb70c5b44db0be", "Maniac Mansion (NES SW)", GID_MANIAC, 1, 0, 25, MDT_NONE, + GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING | GF_NES, 0, 0}, {"6a30a07f353a75cdc602db27d73e1b42", "Putt-Putt Joins The Parade (Windows)", GID_HEGAME, 6, 70, 13, MDT_NONE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0, 0}, {"6af2419fe3db5c2fdb091ae4e5833770", "Putt-Putt Enters the Race (Demo Alt)", GID_FREDDI4, 6, 98, 61, MDT_NONE, |