X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/bbcffc80c95c69d02635b02d37e78912c7f12305..f913a8da9e1bbd0088bb84372b2db8e46fff20f0:/src/image.c

diff --git a/src/image.c b/src/image.c
index f98238e..c8a7165 100644
--- a/src/image.c
+++ b/src/image.c
@@ -282,15 +282,16 @@ unsigned char **lbximg_getframe(struct lbx_image *img, int frame)
 			return NULL;
 	}
 
-	/* Start over if we are backtracking. */
-	if (img->currentframe > frame)
-		img->currentframe == -1;
-
 	if (img->flags & FLAG_OVERWRITE) {
 		/* Clear the slate. */
+		img->currentframe = -1;
 		memset(img->framedata[0], 0, img->width * img->height);
 		memset(img->mask[0],      0, img->width * img->height);
 	} else {
+		/* Start over if we are backtracking. */
+		if (img->currentframe > frame)
+			img->currentframe = -1;
+
 		/* We must have previous frame decoded to continue. */
 		if (frame > img->currentframe + 1) {
 			if (!lbximg_getframe(img, frame-1))
@@ -340,9 +341,10 @@ int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256])
 		}
 
 		palette[i] = (struct lbx_colour){
-			.red   = entry[1] << 2,
-			.green = entry[2] << 2,
-			.blue  = entry[3] << 2,
+			.red    = entry[1] << 2,
+			.green  = entry[2] << 2,
+			.blue   = entry[3] << 2,
+			.active = 1,
 		};
 	}
 
@@ -367,7 +369,6 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
 
 	for (i = 0; i < img->palcount; i++) {
 		rc = img->fops->read(entry, sizeof entry, img->f);
-
 		if (rc < sizeof entry) {
 			goto readerr;
 		}
@@ -378,9 +379,10 @@ lbximg_getpalette(struct lbx_image *img, struct lbx_colour palette[static 256])
 		}
 
 		palette[img->palstart + i] = (struct lbx_colour){
-			.red   = entry[1] << 2,
-			.green = entry[2] << 2,
-			.blue  = entry[3] << 2,
+			.red    = entry[1] << 2,
+			.green  = entry[2] << 2,
+			.blue   = entry[3] << 2,
+			.active = 1,
 		};
 	}