libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 13:42:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

code unification

Browse Source 
svn-id: r8146
This commit is contained in:
Max Horn 2003-05-30 15:39:06 +00:00
parent 3d28cfaf82
commit 5725ee392a
3 changed files with 37 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
scumm/akos.cpp
View File

@ -820,48 +820,22 @@ void AkosRenderer::akos16SetupBitReader(const byte *src) {
akos16.dataptr = src + 4;
}
void AkosRenderer::akos16PutOnScreen(byte *dest, const byte *src, byte transparency, int32 count) {
byte tmp_data;
if (count == 0)
void AkosRenderer::akos16PutOnScreen(byte *dst, const byte *src, byte transparency, int32 count) {
if (count <= 0)
return;
switch(_shadow_mode) {
case 0:
do {
tmp_data = *(src++);
if (tmp_data != transparency) {
*(dest) = tmp_data;
}
dest++;
} while (--count != 0);
_vm->bompApplyShadow0(src, dst, count, transparency);
break;
case 1:
do {
tmp_data = *(src++);
if (tmp_data != transparency) {
if (tmp_data == 13) {
tmp_data = _shadow_table[*(dest)];
}
*(dest) = tmp_data;
}
dest++;
} while (--count != 0);
_vm->bompApplyShadow1(src, dst, count, transparency);
break;
case 3:
do {
tmp_data = *(src++);
if (tmp_data != transparency) {
if (tmp_data < 8) {
tmp_data = _shadow_table[*(dest) + (tmp_data << 8)];
}
*(dest) = tmp_data;
}
dest++;
} while (--count != 0);
_vm->bompApplyShadow3(src, dst, count, transparency);
break;
default:
error("Unknown shadowMode %d", _shadow_mode);
}
}
@ -925,15 +899,13 @@ void AkosRenderer::akos16DecodeLine(byte *buf, int32 numbytes, int32 dir) {
}
void AkosRenderer::akos16ApplyMask(byte *dest, byte *maskptr, byte bits, int32 count, byte fillwith) {
byte tmp;
byte tmp_data = *(maskptr++);
byte bitpos = 1 << (7 - bits);
if (count == 0)
if (count <= 0)
return;
for(;;) {
tmp = tmp_data;
while(1) {
byte tmp = *(maskptr++);
do {
if (tmp & bitpos) {
*(dest) = fillwith;
@ -945,7 +917,6 @@ void AkosRenderer::akos16ApplyMask(byte *dest, byte *maskptr, byte bits, int32 c
} while ((bitpos>>=1) != 0);
bitpos = 0x80;
tmp_data = *(maskptr++);
}
}
@ -991,7 +962,7 @@ void AkosRenderer::akos16DecompressMask(byte *dest, int32 pitch, const byte *src
akos16SkipData(numskip_before);
}
maskpitch = _numStrips ;
maskpitch = _numStrips;
while (t_height != 0) {
akos16DecodeLine(tmp_buf, t_width, dir);
@ -1100,13 +1071,12 @@ byte AkosRenderer::codec16(int xmoveCur, int ymoveCur) {
if (_zbuf == 0) {
akos16Decompress(dest, pitch, _srcptr, cur_x, out_height, dir, numskip_before, numskip_after, transparency);
return 0;
} else {
byte *ptr = _vm->_screenStartStrip + _vm->getResourceAddress(rtBuffer, 9) + _vm->gdi._imgBufOffs[_zbuf];
ptr += _numStrips * clip_top + (clip_left / 8);
akos16DecompressMask(dest, pitch, _srcptr, cur_x, out_height, dir, numskip_before, numskip_after, transparency, ptr, clip_left / 8);
}
byte *ptr = _vm->_screenStartStrip + _vm->getResourceAddress(rtBuffer, 9) + _vm->gdi._imgBufOffs[_zbuf];
ptr += _numStrips * clip_top + (clip_left / 8);
akos16DecompressMask(dest, pitch, _srcptr, cur_x, out_height, dir, numskip_before, numskip_after, transparency, ptr, clip_left / 8);
return 0;
}

38
scumm/gfx.cpp
View File

@ -3320,43 +3320,37 @@ void Scumm::bompApplyMask(byte *line_buffer, byte *mask_src, byte bits, int32 si
}
}
void Scumm::bompApplyShadow0(byte *line_buffer, byte *dst, int32 size) {
while(1) {
if (size-- == 0)
return;
byte tmp = *(line_buffer++);
if (tmp != 255) {
*(dst) = tmp;
void Scumm::bompApplyShadow0(const byte *line_buffer, byte *dst, int32 size, byte transparency) {
while(size-- > 0) {
byte tmp = *line_buffer++;
if (tmp != transparency) {
*dst = tmp;
}
dst++;
}
}
void Scumm::bompApplyShadow1(byte *line_buffer, byte *dst, int32 size) {
while(1) {
if (size-- == 0)
return;
byte tmp = *(line_buffer++);
if (tmp != 255) {
void Scumm::bompApplyShadow1(const byte *line_buffer, byte *dst, int32 size, byte transparency) {
while(size-- > 0) {
byte tmp = *line_buffer++;
if (tmp != transparency) {
if (tmp == 13) {
tmp = _shadowPalette[*(dst)];
}
*(dst) = tmp;
*dst = tmp;
}
dst++;
}
}
void Scumm::bompApplyShadow3(byte *line_buffer, byte *dst, int32 size) {
while(1) {
if (size-- == 0)
return;
byte tmp = *(line_buffer++);
if (tmp != 255) {
void Scumm::bompApplyShadow3(const byte *line_buffer, byte *dst, int32 size, byte transparency) {
while(size-- > 0) {
byte tmp = *line_buffer++;
if (tmp != transparency) {
if (tmp < 8) {
tmp = _shadowPalette[*(dst) + (tmp << 8)];
tmp = _shadowPalette[*dst + (tmp << 8)];
}
*(dst) = tmp;
*dst = tmp;
}
dst++;
}

8
scumm/scumm.h
View File

@ -909,9 +909,11 @@ protected:
int32 bompDecodeLineMode1(const byte *src, byte *line_buffer, int32 size);
int32 bompDecodeLineMode3(const byte *src, byte *line_buffer, int32 size);
void bompApplyMask(byte *line_buffer, byte *mask_out, byte bits, int32 size);
void bompApplyShadow0(byte *line_buffer, byte *dst, int32 size);
void bompApplyShadow1(byte *line_buffer, byte *dst, int32 size);
void bompApplyShadow3(byte *line_buffer, byte *dst, int32 size);
public:
void bompApplyShadow0(const byte *line_buffer, byte *dst, int32 size, byte transparency = 255);
void bompApplyShadow1(const byte *line_buffer, byte *dst, int32 size, byte transparency = 255);
void bompApplyShadow3(const byte *line_buffer, byte *dst, int32 size, byte transparency = 255);
protected:
void bompApplyActorPalette(byte *line_buffer, int32 size);
bool _shakeEnabled;