From: sparky4 <sparky4@cock.li>
Date: Tue, 10 Nov 2015 21:13:59 +0000 (-0600)
Subject: ^^ yay!!
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=544ccf6efbf54ec3bf18c0dc1a71a9943f493905;hp=fe27008e8685590d96a503ff4ce76afe229db4d2;p=16.git

^^ yay!!
---

diff --git a/16.exe b/16.exe
index 2841cdd3..b8d3955c 100755
Binary files a/16.exe and b/16.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index 45d19ef5..535e3f15 100755
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index d9b16004..2b33f92f 100755
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/pcxtest2.exe b/pcxtest2.exe
index f11ee489..73cfe326 100755
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ
diff --git a/planrpcx.exe b/planrpcx.exe
index 9d423535..8fde3f24 100755
Binary files a/planrpcx.exe and b/planrpcx.exe differ
diff --git a/scroll.exe b/scroll.exe
index 5ee67760..3488f5ec 100755
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/modex16/16render.c b/src/lib/modex16/16render.c
index 500afdbf..f80d5ea8 100755
--- a/src/lib/modex16/16render.c
+++ b/src/lib/modex16/16render.c
@@ -31,33 +31,31 @@
 //modexDrawBmpRegion	(page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp)
 void modexDrawPBufRegion	(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite)
 {
-	sword plane;
+	word plane;
 	int i;
-	const int px=x;//-page->dx;
-	const int py=y;//-page->dy;
-	#define PEEE ((rw)/4)-rx
-	//-(rx/4)
-	#define PEEEE ((p->pwidth)*(ry))
-	//y=py;
-	//x=px;
+	const int px=x+page->dx;
+	const int py=y+page->dy;
+	const int prw = rw/4;
+	rx+=1;
+	ry+=1;
+	#define PEEE	rx-prw
+	#define PE		(p->pwidth)
+	#define PEEEE	(PE*(ry))
+	y=py;
+	x=px;
 	//printf("%d,%d p(%d,%d) r(%d,%d) rwh(%d,%d)\n", x, y, px, py, rx, ry, rw, rh);
 	for(plane=0; plane < 4; plane++) {
 		i=PEEE+PEEEE;
-		//printf("PEEE=%d ", PEEE);
-		//printf("PEEEE=%d ", PEEEE);
-		//printf("i=%d\n", i);
-		modexSelectPlane(PLANE(plane+x));
+		modexSelectPlane(PLANE(plane-1));
 		for(; y < py+rh; y++) {
 			//for(px=0; px < p->width; px++) {
 				//printf("%02X ", (int) p->plane[plane][i++]);
 //			      _fmemcpy(buff, &(p->plane[plane][i+=p->pwidth]), p->pwidth);
 //			      printf("buff %u==%s\n", y, *buff);
-				_fmemcpy(page->data + (((page->width/4) * y) + (x / 4)), &(p->plane[plane][i+=p->pwidth]), (rw/4));
+				_fmemcpy(page->data + (((page->width/4) * (y)) + ((x) / 4)), &(p->plane[plane][i]), prw);
+				i+=PE;
 			//}
-			//if(plane==3) IN_Ack();
 		}
-		/*printf("y%d=%d ", plane, y);
-		if(plane==3) printf("y%d=%d\n", plane, y);*/
 		x=px;
 		y=py;
 		}
@@ -68,7 +66,9 @@ void modexDrawPBufRegion	(page_t *page, int x, int y, int rx, int ry, int rw, in
 void
 modexDrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
 {
-	int plane;
+	modexDrawPBufRegion	(page, x, x, 0, 0, p->width, p->height, p, sprite);
+	/*
+	sword plane;
 	int i;
 // 	byte near *buff;
 	const int px=x+page->dx;
@@ -107,7 +107,7 @@ modexDrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
 		x=px;
 		y=py;
 	}
-// 	_nfree(buff);
+// 	_nfree(buff);*/
 }
 
 void
diff --git a/src/planrpcx.c b/src/planrpcx.c
index 9dc97ce4..bb473178 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -94,14 +94,15 @@ baka = 1;
 		modexDrawPBuf		(&gvar.video.page[0], 0, 0, &p, 0);
 	}
 	t3 = (*clockw-start) /18.2;
+getch();
 	for(i=0; i<100 ;i++) {
-		//modexDrawPBufRegion	(&gvar.video.page[0], 0, 0, 0+p.width, 0, p.width, p.height, &p, 0);
+						//(page_t *page, int x, int y, int rx, int ry, int rw, int rh, planar_buf_t *p, boolean sprite);
+		modexDrawPBufRegion	(&gvar.video.page[0], p.width, 0, p.width-16, p.height-16, 16, 16, &p, 0);//(&gvar.video.page[0], 0, 0, 0+p.width, 0, p.width, p.height, &p, 0);
 	}
 	t4 = (*clockw-start) /18.2;
 	//++++	modexPalUpdate1(ptmp.palette);
 	//modexDrawBmpPBufRegion(&gvar.video.page[0], 64, 64, 48, 32, 24, 32, ptmp);
 	//modexDrawPBuf(&gvar.video.page[0], 64, 64, &ptmp, 0);
-getch();
 	while(!kbhit())
 	{
 	}
diff --git a/test.exe b/test.exe
index 27ea560d..798f4b1b 100755
Binary files a/test.exe and b/test.exe differ