isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 10:41:15 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix bugs in FLC decoding, and cleanup

Browse Source
This commit is contained in:
Nathan 2024-02-29 03:16:57 -05:00
parent 8f1eaa037e
commit 99831b9663
1 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
LEGO1/omni/src/video/flic.cpp
View File

@ -247,32 +247,35 @@ void DecodeColors64(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_data)
// FUNCTION: LEGO1 0x100bd960 // FUNCTION: LEGO1 0x100bd960
void DecodeBrun(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_data, FLIC_HEADER* p_flcHeader) void DecodeBrun(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_data, FLIC_HEADER* p_flcHeader)
{ {
BYTE* data = p_data;
short width = p_flcHeader->width;
short height = p_flcHeader->height;
BYTE* offset = ((p_bitmapHeader->biWidth + 3) & -4) * (p_flcHeader->height - 1) + p_pixelData; BYTE* offset = ((p_bitmapHeader->biWidth + 3) & -4) * (p_flcHeader->height - 1) + p_pixelData;
short line = p_flcHeader->height;
while (--line >= 0) { for (short line = height - 1; line >= 0; line--) {
p_data++; data++;
for (short p_pixel = 0; p_pixel < p_flcHeader->width;) { for (short pixel = 0; pixel < width;) {
char p_count = *p_data++; char count = *data++;
if (p_count >= 0) { if (count >= 0) {
for (short i = p_count; i > 0; i--) { for (short i = 0; i < count; i++) {
*offset++ = *p_data; *offset++ = *data;
} }
p_data++; data++;
} }
else { else {
for (short i = -p_count; i > 0; i--) { count = -count;
*offset++ = *p_data++; for (short i = 0; i < count; i++) {
*offset++ = *data++;
} }
} }
p_pixel += p_count; pixel += count;
} }
offset -= (((p_bitmapHeader->biWidth + 3) & -4) + p_flcHeader->width); offset -= (((p_bitmapHeader->biWidth + 3) & -4) + width);
} }
} }
@ -280,30 +283,26 @@ void DecodeBrun(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_da
void DecodeLC(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_data, FLIC_HEADER* p_flcHeader) void DecodeLC(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_data, FLIC_HEADER* p_flcHeader)
{ {
short row = p_flcHeader->height - *((short*) p_data) - 1; short row = p_flcHeader->height - *((short*) p_data) - 1;
BYTE* pixels = p_data + 4; BYTE* data = p_data + 4;
short numLines = *((short*) (p_data + 2));
while (--numLines >= 0) { for (short lines = *((short*) (p_data + 2)) - 1; lines >= 0; lines--) {
WORD column = 0; WORD column = 0;
BYTE i = *pixels++; BYTE packets = *data++;
while (i) { for (BYTE i = 0; i < packets; i++) {
column += *pixels++; column += *data++;
char type = *pixels++; char type = *((char*) data++);
short p_count;
if (type < 0) { if (type < 0) {
p_count = -type; type = -type;
WritePixelRun(p_bitmapHeader, p_pixelData, column, row, *pixels++, p_count); WritePixelRun(p_bitmapHeader, p_pixelData, column, row, *data++, type);
column += type;
} }
else { else {
p_count = type; WritePixels(p_bitmapHeader, p_pixelData, column, row, data, type);
WritePixels(p_bitmapHeader, p_pixelData, column, row, pixels, p_count); data += type;
pixels += p_count; column += type;
} }
column += p_count;
i--;
} }
row--; row--;
@ -315,40 +314,41 @@ void DecodeSS2(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_dat
{ {
short width = p_flcHeader->width - 1; short width = p_flcHeader->width - 1;
short row = p_flcHeader->height - 1; short row = p_flcHeader->height - 1;
short lines = *p_data; short lines = *((short*) p_data);
BYTE* data = p_data + 2; BYTE* data = p_data + 2;
do { while (--lines > 0) {
short token; short token;
while (TRUE) { while (TRUE) {
token = *((WORD*) data); token = *((short*) data);
data += 2; data += 2;
if (token < 0) { if (token < 0) {
if (token & 0x4000) { if (token & 0x4000) {
row += token; row += token;
continue; }
else {
WritePixel(p_bitmapHeader, p_pixelData, width, row, token);
token = *((WORD*) data);
data += 2;
if (!token) {
row--;
if (--lines <= 0) {
return;
}
}
else {
break;
}
} }
} }
else
break; break;
} }
if (token < 0) {
WritePixel(p_bitmapHeader, p_pixelData, width, row, token);
token = *((WORD*) data);
data += 2;
if (!token) {
row--;
continue;
}
}
short column = 0; short column = 0;
do { do {
column += *(data++); column += *(data++);
short type = ((short) *(data++)); short type = *((char*) data++);
type += type; type += type;
if (type >= 0) { if (type >= 0) {
@ -360,29 +360,29 @@ void DecodeSS2(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_dat
type = -type; type = -type;
short p_pixel = *((WORD*) data); short p_pixel = *((WORD*) data);
data += 2; data += 2;
WritePixelPairs(p_bitmapHeader, p_pixelData, column, row, p_pixel, type); WritePixelPairs(p_bitmapHeader, p_pixelData, column, row, p_pixel, type >> 1);
column += type; column += type;
} }
} while (--token); } while (--token);
} while (--lines > 0); row--;
}
} }
// FUNCTION: LEGO1 0x100bdc00 // FUNCTION: LEGO1 0x100bdc00
void DecodeBlack(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_data, FLIC_HEADER* p_flcHeader) void DecodeBlack(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_data, FLIC_HEADER* p_flcHeader)
{ {
short line = p_flcHeader->height;
short width = p_flcHeader->width; short width = p_flcHeader->width;
BYTE pixel[2]; BYTE pixel[2];
pixel[1] = 0; pixel[1] = 0;
pixel[0] = 0; pixel[0] = 0;
short line = p_flcHeader->height;
while (--line >= 0) { while (--line >= 0) {
short p_count = width / 2; short count = width / 2;
short odd = width & 1; short odd = width & 1;
WritePixelPairs(p_bitmapHeader, p_pixelData, 0, line, *((WORD*) pixel), p_count); WritePixelPairs(p_bitmapHeader, p_pixelData, 0, line, *((WORD*) pixel), count);
if (odd) { if (odd) {
WritePixel(p_bitmapHeader, p_pixelData, width - 1, line, 0); WritePixel(p_bitmapHeader, p_pixelData, width - 1, line, 0);
@ -394,10 +394,10 @@ void DecodeBlack(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_d
void DecodeCopy(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_data, FLIC_HEADER* p_flcHeader) void DecodeCopy(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_data, FLIC_HEADER* p_flcHeader)
{ {
short line = p_flcHeader->height; short line = p_flcHeader->height;
int width = p_flcHeader->width; short width = p_flcHeader->width;
while (--line >= 0) { while (--line >= 0) {
WritePixels(p_bitmapHeader, p_pixelData, 0, line, p_data, p_flcHeader->width); WritePixels(p_bitmapHeader, p_pixelData, 0, line, p_data, width);
p_data += width; p_data += width;
} }
} }