libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-21 01:05:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rewrote c64_ignorePakCols to what I *think* it should look like, base on my understanding of the code. so far completely untested :-)

Browse Source 
svn-id: r8864
This commit is contained in:
Max Horn 2003-07-08 17:44:06 +00:00
parent 00a87fda03
commit 66ec3f9c75
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
scumm/costume.cpp
View File

@ -280,27 +280,24 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) {
return drawFlag;
}
// FIXME: Call this something sensible, make sure it works
void CostumeRenderer::c64_ignorePakCols(int num) {
warning("c64_ignorePakCols(%d) - this needs testing", num);
#if 1
// Fingolfin seez: this code is equivalent to codec1_ignorePakCols.
// And I wonder if that can be true, considering the different
// compressor used in procC64 vs. proc3 ?
codec1_ignorePakCols(num);
for (int x = 0; x < (num >> 3); x++) {
v1.repcolor = *_srcptr++;
if (v1.repcolor & 0x80) {
v1.replen = v1.repcolor & 0x7f;
v1.repcolor = *_srcptr++;
} else {
v1.replen = v1.repcolor;
for (int z = 0; z < v1.replen; z++) {
v1.repcolor = *_srcptr++;
}
}
}
#else
int n = _height * num;
do {
v1.repcolor = *_srcptr >> 4;
v1.replen = *_srcptr++ & 0x0F;
if (v1.replen == 0)
v1.replen = *_srcptr++;
do {
if (!--n) return;
} while (--v1.replen);
} while (1);
codec1_ignorePakCols(num);
#endif
}
@ -574,6 +571,9 @@ byte CostumeRenderer::drawLimb(const CostumeData &cost, int limb) {
const CostumeInfo *costumeInfo;
int xmoveCur, ymoveCur;
//printf("costume %d, limb %d:\n", _loaded._id, limb);
//printf("_srcptr:\n");
//hexdump(_srcptr, 0x20);
if (_vm->_version == 1) {
_width = _srcptr[0] * 8;
_height = _srcptr[1];
@ -583,10 +583,6 @@ byte CostumeRenderer::drawLimb(const CostumeData &cost, int limb) {
_ymove -= _srcptr[5];
_srcptr += 6;
} else {
// FIXME: those are here just in case... you never now...
assert(_srcptr[1] == 0);
assert(_srcptr[3] == 0);
costumeInfo = (const CostumeInfo *)_srcptr;
_width = READ_LE_UINT16(&costumeInfo->width);
_height = READ_LE_UINT16(&costumeInfo->height);
@ -596,7 +592,7 @@ byte CostumeRenderer::drawLimb(const CostumeData &cost, int limb) {
_ymove -= (int16)READ_LE_UINT16(&costumeInfo->move_y);
_srcptr += 12;
}
//printf("costume %d, limb %d: _width %d, _height %d, xmoveCur %d, ymoveCur %d, _xmove %d, _ymove, %d\n", _loaded._id, limb, _width, _height, xmoveCur, ymoveCur, _xmove, _ymove);
//printf(" _width %d, _height %d, xmoveCur %d, ymoveCur %d, _xmove %d, _ymove, %d\n", _width, _height, xmoveCur, ymoveCur, _xmove, _ymove);
return mainRoutine(xmoveCur, ymoveCur);
}
}