zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

animlib: Make some weird code easier to read.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6690 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-02-25 01:18:21 +00:00
parent 9f48927ea8
commit f10551086b
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
source/mact/src/animlib.cpp
View file

@ -147,7 +147,8 @@ static inline void loadpage(uint16_t pagenumber, uint16_t **pagepointer)
if (anim->curlpnum == pagenumber) if (anim->curlpnum == pagenumber)
return; return;
anim->curlp = &anim->LpArray[(anim->curlpnum = pagenumber)]; anim->curlpnum = pagenumber;
anim->curlp = &anim->LpArray[pagenumber];
*pagepointer = (uint16_t *)(anim->buffer + 0xb00 + (pagenumber*IMAGEBUFFERSIZE) + *pagepointer = (uint16_t *)(anim->buffer + 0xb00 + (pagenumber*IMAGEBUFFERSIZE) +
sizeof(lp_descriptor) + sizeof(uint16_t)); sizeof(lp_descriptor) + sizeof(uint16_t));
} }
@ -176,13 +177,17 @@ static void decodeframe(uint8_t * srcP, uint8_t * dstP)
if (!count) /* Short RLE */ if (!count) /* Short RLE */
{ {
int32_t color = *(srcP+1); int32_t color = *(srcP+1);
count = *(uint8_t *)((srcP += sizeof(int16_t)) - sizeof(int16_t)); count = *(uint8_t *)srcP;
Bmemset((dstP += count) - count, color, count); srcP += sizeof(int16_t);
Bmemset(dstP, color, count);
dstP += count;
continue; continue;
} }
else if ((count & 0x80) == 0) /* Short copy */ else if ((count & 0x80) == 0) /* Short copy */
{ {
Bmemcpy((dstP += count) - count, (srcP += count) - count, count); Bmemcpy(dstP, srcP, count);
dstP += count;
srcP += count;
continue; continue;
} }
else if ((count &= ~0x80) > 0) /* short skip */ else if ((count &= ~0x80) > 0) /* short skip */
@ -206,12 +211,15 @@ static void decodeframe(uint8_t * srcP, uint8_t * dstP)
{ {
int32_t color = *srcP++; int32_t color = *srcP++;
count &= ~0x4000; count &= ~0x4000;
Bmemset((dstP += count) - count, color, count); Bmemset(dstP, color, count);
dstP += count;
continue; continue;
} }
/* long copy */ /* long copy */
Bmemcpy((dstP += count) - count, (srcP += count) - count, count); Bmemcpy(dstP, srcP, count);
dstP += count;
srcP += count;
} }
while (1); while (1);
} }
@ -235,7 +243,10 @@ static void renderframe(uint16_t framenumber, uint16_t *pagepointer)
ppointer = (uint8_t *)(pagepointer) + anim->curlp->nRecords*2 + offset + 4; ppointer = (uint8_t *)(pagepointer) + anim->curlp->nRecords*2 + offset + 4;
if ((ppointer-4)[1]) if ((ppointer-4)[1])
ppointer += B_LITTLE16(((uint16_t *)(ppointer-4))[1]) + (B_LITTLE16(((uint16_t *)(ppointer-4))[1]) & 1); {
uint16_t const temp = B_LITTLE16(((uint16_t *)(ppointer-4))[1]);
ppointer += temp + (temp & 1);
}
decodeframe((uint8_t *)ppointer, (uint8_t *)anim->imagebuffer); decodeframe((uint8_t *)ppointer, (uint8_t *)anim->imagebuffer);
} }