|
@@ -49,97 +49,97 @@ bool SpriteLoaderGrf::LoadSprite(SpriteL
|
|
|
|
|
|
/* Type 0xFF indicates either a colourmap or some other non-sprite info; we do not handle them here */
|
|
|
if (type == 0xFF) return false;
|
|
|
|
|
|
sprite->height = FioReadByte();
|
|
|
sprite->width = FioReadWord();
|
|
|
sprite->x_offs = FioReadWord();
|
|
|
sprite->y_offs = FioReadWord();
|
|
|
|
|
|
/* 0x02 indicates it is a compressed sprite, so we can't rely on 'num' to be valid.
|
|
|
* In case it is uncompressed, the size is 'num' - 8 (header-size). */
|
|
|
num = (type & 0x02) ? sprite->width * sprite->height : num - 8;
|
|
|
|
|
|
byte *dest_orig = AllocaM(byte, num);
|
|
|
byte *dest = dest_orig;
|
|
|
const int dest_size = num;
|
|
|
|
|
|
/* Read the file, which has some kind of compression */
|
|
|
while (num > 0) {
|
|
|
int8 code = FioReadByte();
|
|
|
|
|
|
if (code >= 0) {
|
|
|
/* Plain bytes to read */
|
|
|
int size = (code == 0) ? 0x80 : code;
|
|
|
num -= size;
|
|
|
if (num < 0) return WarnCorruptSprite(file_slot, file_pos, __LINE__);
|
|
|
for (; size > 0; size--) {
|
|
|
*dest = FioReadByte();
|
|
|
dest++;
|
|
|
}
|
|
|
} else {
|
|
|
/* Copy bytes from earlier in the sprite */
|
|
|
const uint data_offset = ((code & 7) << 8) | FioReadByte();
|
|
|
if (dest - data_offset < dest_orig) return WarnCorruptSprite(file_slot, file_pos, __LINE__);
|
|
|
int size = -(code >> 3);
|
|
|
num -= size;
|
|
|
if (num < 0) return WarnCorruptSprite(file_slot, file_pos, __LINE__);
|
|
|
for (; size > 0; size--) {
|
|
|
*dest = *(dest - data_offset);
|
|
|
dest++;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (num != 0) return WarnCorruptSprite(file_slot, file_pos, __LINE__);
|
|
|
|
|
|
sprite->AllocateData(sprite->width * sprite->height);
|
|
|
|
|
|
/* When there are transparency pixels, this format has an other trick.. decode it */
|
|
|
/* When there are transparency pixels, this format has another trick.. decode it */
|
|
|
if (type & 0x08) {
|
|
|
for (int y = 0; y < sprite->height; y++) {
|
|
|
bool last_item = false;
|
|
|
/* Look up in the header-table where the real data is stored for this row */
|
|
|
int offset = (dest_orig[y * 2 + 1] << 8) | dest_orig[y * 2];
|
|
|
|
|
|
/* Go to that row */
|
|
|
dest = dest_orig + offset;
|
|
|
|
|
|
do {
|
|
|
if (dest + 2 > dest_orig + dest_size) {
|
|
|
free(sprite->data);
|
|
|
return WarnCorruptSprite(file_slot, file_pos, __LINE__);
|
|
|
}
|
|
|
|
|
|
SpriteLoader::CommonPixel *data;
|
|
|
/* Read the header:
|
|
|
* 0 .. 14 - length
|
|
|
* 15 - last_item
|
|
|
* 16 .. 31 - transparency bytes */
|
|
|
last_item = ((*dest) & 0x80) != 0;
|
|
|
int length = (*dest++) & 0x7F;
|
|
|
int skip = *dest++;
|
|
|
|
|
|
data = &sprite->data[y * sprite->width + skip];
|
|
|
|
|
|
if (skip + length > sprite->width || dest + length > dest_orig + dest_size) {
|
|
|
free(sprite->data);
|
|
|
return WarnCorruptSprite(file_slot, file_pos, __LINE__);
|
|
|
}
|
|
|
|
|
|
for (int x = 0; x < length; x++) {
|
|
|
switch (sprite_type) {
|
|
|
case ST_NORMAL: data->m = _palette_remap_grf[file_slot] ? _palette_remap[*dest] : *dest; break;
|
|
|
case ST_FONT: data->m = min(*dest, 2u); break;
|
|
|
default: data->m = *dest; break;
|
|
|
}
|
|
|
dest++;
|
|
|
data++;
|
|
|
}
|
|
|
} while (!last_item);
|
|
|
}
|
|
|
} else {
|
|
|
if (dest_size < sprite->width * sprite->height) {
|
|
|
free(sprite->data);
|
|
|
return WarnCorruptSprite(file_slot, file_pos, __LINE__);
|
|
|
}
|
|
|
|