X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/84050ee438ba1661047709f3c8b95b126ca10f93..9311c2e7ce657110da33c9bc5ebc529b320484b9:/src/image.c

diff --git a/src/image.c b/src/image.c
index c8a7165..9ad154a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -31,9 +31,11 @@
 #include "image.h"
 
 #define FLAG_OVERWRITE 0x0400 /* Draw each frame on a clean slate (unsure). */
+#define FLAG_BUILDING  0x0800 /* Buildings have this, related to shadow? */
 #define FLAG_PALETTE   0x1000 /* Image contains embedded palette. */
 #define FLAG_LOOPING   0x2000 /* Loop over all frames in the image (unsure). */
-#define FLAG_ALL (FLAG_OVERWRITE|FLAG_PALETTE|FLAG_LOOPING)
+
+#define FLAG_ALL (FLAG_OVERWRITE|FLAG_BUILDING|FLAG_PALETTE|FLAG_LOOPING)
 
 #define HDR_LEN 12
 
@@ -324,13 +326,15 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
 	return img->framedata;
 }
 
-int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256])
+int
+lbximg_loadpalette(void *f, const struct lbx_file_ops *fops,
+                   struct lbx_colour palette[static 256])
 {
 	unsigned char entry[4];
 	int i;
 
 	for (i = 0; i < 256; i++) {
-		if (fread(entry, sizeof entry, 1, f) != 1) {
+		if (fops->read(entry, sizeof entry, f) != sizeof entry) {
 			lbx_errno = (feof(f)) ? LBX_EEOF : -errno;
 			return -1;
 		}
@@ -340,7 +344,7 @@ int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256])
 			return -1;
 		}
 
-		palette[i] = (struct lbx_colour){
+		palette[i] = (struct lbx_colour) {
 			.red    = entry[1] << 2,
 			.green  = entry[2] << 2,
 			.blue   = entry[3] << 2,