# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1509096744 -10800
# Node ID 0d3d7b020e6a75b959da1bba8eac22f7b6134634
# Parent  0fd37effde29830e83ad78d9383e507dabba6616
progress...

diff -r 0fd37effde29 -r 0d3d7b020e6a src/amiga/gfx.c
--- a/src/amiga/gfx.c	Fri Oct 27 11:36:18 2017 +0300
+++ b/src/amiga/gfx.c	Fri Oct 27 12:32:24 2017 +0300
@@ -167,7 +167,7 @@
 	for(i=0; i<num_bitplanes; i++) {
 		add_copper(COPPER_MOVE(bplptr[i], bpladdr >> 16));
 		add_copper(COPPER_MOVE(bplptr[i] + 2, bpladdr));
-		bpladdr += fb_width / 8 * num_bitplanes;
+		bpladdr += fb_width / 8;
 	}
 }
 
diff -r 0fd37effde29 -r 0d3d7b020e6a src/image.c
--- a/src/image.c	Fri Oct 27 11:36:18 2017 +0300
+++ b/src/image.c	Fri Oct 27 12:32:24 2017 +0300
@@ -153,15 +153,15 @@
 			pixval = 0;
 			for(x=0; x<w; x++) {
 				if(i < 4) {
-					unsigned char val = (y & 1) ? 0 : 0xff;
-					pixval = (pixval >> 1) | (((val >> i) & 1) ? 0x80 : 0);
+					unsigned char val = ((y >> 3) & 1) == ((x >> 3) & 1) ? 0 : 0xff;
+					pixval = (pixval >> 1) | (val & 0x80);
 				}
 				if((x & 7) == 7) {
 					*pptr++ = pixval;
 					pixval = 0;
 				}
 			}
-			pptr += w / 8 * (img->nbitplanes - 1);
+			pptr += w / 8 * (nbpl - 1);
 		}
 	}
 
diff -r 0fd37effde29 -r 0d3d7b020e6a src/sdl/gfx.c
--- a/src/sdl/gfx.c	Fri Oct 27 11:36:18 2017 +0300
+++ b/src/sdl/gfx.c	Fri Oct 27 12:32:24 2017 +0300
@@ -153,12 +153,12 @@
 			int bit = 7 - (j & 7);
 
 			for(k=0; k<img->nbitplanes; k++) {
-				idx = (idx << 1) | ((*(src + k * img->width / 8) >> bit) & 1);
+				idx |= (((*(src + k * img->width / 8) >> bit) & 1) << k);
 			}
 
 			printf("%d ", idx);
 			color = palette[idx];
-			/*ham = (idx >> 4) & 3;
+			ham = (idx >> 4) & 3;
 			color = (i & j) ? dest[-1] : 0;
 
 			switch(ham) {
@@ -174,7 +174,6 @@
 			case 3:
 				color = (color & ~GMASK) | (((uint32_t)idx & 0xf) << GSHIFT);
 			}
-			*/
 
 			*dest++ = color;
 			if(!bit) {