diff options
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/costume.cpp | 43 | ||||
| -rw-r--r-- | scumm/costume.h | 1 |
2 files changed, 2 insertions, 42 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp index adf995a9ad..127787fd4f 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -209,7 +209,7 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) { v1.scaleXstep = _mirror ? 1 : -1; if (_vm->_version == 1) - // HACK: Fix a glitch where costumes in V1 games leave a trail when the actor moves left + // V1 games uses 8 x 8 pixels for actors _vm->markRectAsDirty(kMainVirtScreen, rect.left, rect.right + 8, rect.top, rect.bottom, _actorID); else _vm->markRectAsDirty(kMainVirtScreen, rect.left, rect.right + 1, rect.top, rect.bottom, _actorID); @@ -249,6 +249,7 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) { v1.x = _outwidth - 1; } } else { + // V1 games uses 8 x 8 pixels for actors if (_loaded._format == 0x57) skip = -8 - rect.left; else @@ -304,46 +305,6 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) { return drawFlag; } -void CostumeRenderer::c64_ignorePakCols(int num) { - - warning("c64_ignorePakCols(%d) - this needs testing", num); - - // FIXME: A problem with this is that num can be a number - // not divisible by 8, e.g. c64_ignorePakCols(17) happens. - // We currently don't really deal with that. OTOH it seems - // in all cases the number was of the form 8n+1, e.g. 1, 9, 17 - // - - uint height = _height; - num /= 8; - - while (num > 0) { - v1.replen = *_srcptr++; - if (v1.replen & 0x80) { - v1.replen &= 0x7f; - v1.repcolor = *_srcptr++; - while (v1.replen--) { - if (!--height) { - if (!--num) { - v1.replen |= 0x80; - return; - } - height = _height; - } - } - } else { - while (v1.replen--) { - v1.repcolor = *_srcptr++; - if (!--height) { - if (!--num) - return; - height = _height; - } - } - } - } -} - static const int v1MMActorPalatte1[25] = { 8, 8, 8, 8, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 }; diff --git a/scumm/costume.h b/scumm/costume.h index c85b8fa0c8..52293d2134 100644 --- a/scumm/costume.h +++ b/scumm/costume.h @@ -75,7 +75,6 @@ protected: void proc3_ami(); void procC64(int actor); - void c64_ignorePakCols(int num); byte mainRoutine(int xmoveCur, int ymoveCur); }; |