|
@@ -73,49 +73,49 @@ bool SpriteLoaderGrf::LoadSprite(SpriteL
|
|
|
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++;
|
|
|
|