libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

turns out the +4 on _baseptr is needed everywhere - now _animCmds matches between V1 and V2 MM, too, as well as the frameptr

Browse Source 
svn-id: r8861
This commit is contained in:
Max Horn 2003-07-08 17:08:44 +00:00
parent c1635b94bf
commit d9a604a925
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scumm/costume.cpp
View File

@ -539,7 +539,12 @@ void LoadedCostume::loadCostume(int id) {
} }
ptr += 8 + _numColors; ptr += 8 + _numColors;
_frameOffsets = ptr + 2; _frameOffsets = ptr + 2;
_dataOffsets = ptr + ((_vm->_version == 1) ? 18 : 34); // FIXME - V1 case might be wrong if (_vm->_version == 1) {
_dataOffsets = ptr + 18;
_baseptr += 4;
} else {
_dataOffsets = ptr + 34;
}
_animCmds = _baseptr + READ_LE_UINT16(ptr); _animCmds = _baseptr + READ_LE_UINT16(ptr);
} }
@ -555,15 +560,25 @@ byte CostumeRenderer::drawLimb(const CostumeData &cost, int limb) {
// Determine the position the limb is at // Determine the position the limb is at
i = cost.curpos[limb] & 0x7FFF; i = cost.curpos[limb] & 0x7FFF;
//printf("costume %d, limb %d:\n", _loaded._id, limb);
// Get the frame pointer for that limb // Get the frame pointer for that limb
frameptr = _loaded._baseptr + READ_LE_UINT16(_loaded._frameOffsets + limb * 2); frameptr = _loaded._baseptr + READ_LE_UINT16(_loaded._frameOffsets + limb * 2);
//printf("frameptr:\n");
//hexdump(frameptr-0x10, 0x20);
// Determine the offset to the costume data for the limb at position i // Determine the offset to the costume data for the limb at position i
code = _loaded._animCmds[i] & 0x7F; code = _loaded._animCmds[i] & 0x7F;
// Code 0x7B indicates a limb for which there is nothing to draw // Code 0x7B indicates a limb for which there is nothing to draw
if (code != 0x7B) { if (code != 0x7B) {
//printf("code %d:\n", code);
//hexdump(frameptr + code * 2 - 0x10, 0x20);
_srcptr = _loaded._baseptr + READ_LE_UINT16(frameptr + code * 2); _srcptr = _loaded._baseptr + READ_LE_UINT16(frameptr + code * 2);
//printf("_srcptr:\n");
//hexdump(_srcptr, 0x20);
if (!(_vm->_features & GF_OLD256) || code < 0x79) { if (!(_vm->_features & GF_OLD256) || code < 0x79) {
const CostumeInfo *costumeInfo; const CostumeInfo *costumeInfo;
int xmoveCur, ymoveCur; int xmoveCur, ymoveCur;
@ -619,24 +634,18 @@ void Scumm::cost_decodeData(Actor *a, int frame, uint usemask) {
return; return;
} }
//printf("Offset table:\n");
//hexdump(lc._dataOffsets + anim * 2 - 0x10, 0x20);
r = lc._baseptr + READ_LE_UINT16(lc._dataOffsets + anim * 2); r = lc._baseptr + READ_LE_UINT16(lc._dataOffsets + anim * 2);
//printf("actor %d, costum %d, frame %d, anim %d:\n", a->number, lc._id, frame, anim);
//hexdump(r, 0x20);
if (r == lc._baseptr) { if (r == lc._baseptr) {
return; return;
} }
if (_version == 1) { if (_version == 1) {
r += 4;
mask = *r++ << 8; mask = *r++ << 8;
} else { } else {
mask = READ_LE_UINT16(r); mask = READ_LE_UINT16(r);
r += 2; r += 2;
} }
//printf("mask = 0x%x, usemask = 0x%x\n", mask, usemask);
i = 0; i = 0;
do { do {
if (mask & 0x8000) { if (mask & 0x8000) {