From: sparky4 <sparky4@cock.li>
Date: Thu, 29 Oct 2015 16:36:01 +0000 (-0500)
Subject: hmmm
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=23895485b76fb71133aeac259a3075a27c1a1a8c;p=16.git

hmmm
---

diff --git a/16.exe b/16.exe
index 1f9dd447..cc49d276 100755
Binary files a/16.exe and b/16.exe differ
diff --git a/bakapi.exe b/bakapi.exe
index 3d0f96e9..9d2d657c 100755
Binary files a/bakapi.exe and b/bakapi.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index d98194bf..f810b5d4 100755
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index 481b07df..cb2a34a5 100755
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/maptest.exe b/maptest.exe
index dbff0af5..fa23696e 100755
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/palettec.exe b/palettec.exe
index e928b737..bec01844 100755
Binary files a/palettec.exe and b/palettec.exe differ
diff --git a/palettel.exe b/palettel.exe
index 873d452c..7e0cdaf4 100755
Binary files a/palettel.exe and b/palettel.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index 688844cc..1898c3e1 100755
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/pcxtest2.exe b/pcxtest2.exe
index a5f58aa7..68202603 100755
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ
diff --git a/planrpcx.exe b/planrpcx.exe
index 725a03bc..3088759c 100755
Binary files a/planrpcx.exe and b/planrpcx.exe differ
diff --git a/scroll.exe b/scroll.exe
index 7d64ca84..0866a9fd 100755
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index fe358fce..3c0a2ae8 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -401,11 +401,12 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
 void modexDrawPBufRegion	(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite)
 {
 	int plane;
-	int px, py, i;
-	px=x;
-	py=y;
+	//const int px, py;
+	int i;
+	const int px=x-page->dx;
+	const int py=y-page->dy;
 	for(plane=0; plane < 4; plane++) {
-		i=(rx/4)+((rx/4)*ry);
+		i=(rx/4)+((p->pwidth)*ry);
 		modexSelectPlane(PLANE(plane+x));
 		for(; y < py+rh; y++) {
 			//for(px=0; px < p->width; px++) {
@@ -426,10 +427,10 @@ void
 DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
 {
 	int plane;
-	int px, py, i;
+	int i;
 // 	byte near *buff;
-	px=x;
-	py=y;
+	const int px=x;
+	const int py=y;
 // 	buff = _nmalloc(p->pwidth+1);
 	// TODO Make this fast.  It's SLOOOOOOW
 // 	for(plane=0; plane < 4; plane++) {
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index ac883cba..a60d13ea 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -504,6 +504,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 				//cannot print number value du to it being slow as bakapee
 #else
 #ifdef BMPTYPE
+				modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((t->debug_data[i])+1)*2);
 				//modexDrawPBufRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data), 0);
 #else
 				modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
diff --git a/test.exe b/test.exe
index 1d32558c..5a8f2b6b 100755
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index 27bb1517..795e393f 100755
Binary files a/test2.exe and b/test2.exe differ