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

crazy
---

diff --git a/16.exe b/16.exe
index a09e57a9..c5814a13 100755
Binary files a/16.exe and b/16.exe differ
diff --git a/bakapi.exe b/bakapi.exe
index 9d2d657c..826a04b2 100755
Binary files a/bakapi.exe and b/bakapi.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index 4afeeacd..3c19abdd 100755
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index cb2a34a5..5731cfaa 100755
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/maptest.exe b/maptest.exe
index fa23696e..3c334372 100755
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/palettec.exe b/palettec.exe
index bec01844..541a204f 100755
Binary files a/palettec.exe and b/palettec.exe differ
diff --git a/palettel.exe b/palettel.exe
index 7e0cdaf4..3cd44e61 100755
Binary files a/palettel.exe and b/palettel.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index 1898c3e1..de97e042 100755
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/pcxtest2.exe b/pcxtest2.exe
index 68202603..8b127a11 100755
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ
diff --git a/planrpcx.exe b/planrpcx.exe
index 7a9eae75..53bb91b9 100755
Binary files a/planrpcx.exe and b/planrpcx.exe differ
diff --git a/scroll.exe b/scroll.exe
index 41068901..cd163af1 100755
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 3c0a2ae8..366d6fa2 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -406,7 +406,7 @@ void modexDrawPBufRegion	(page_t *page, int x, int y, int rx, int ry, int rw, in
 	const int px=x-page->dx;
 	const int py=y-page->dy;
 	for(plane=0; plane < 4; plane++) {
-		i=(rx/4)+((p->pwidth)*ry);
+		i=(rw/4)+((p->pwidth)*ry);
 		modexSelectPlane(PLANE(plane+x));
 		for(; y < py+rh; y++) {
 			//for(px=0; px < p->width; px++) {
diff --git a/src/scroll.c b/src/scroll.c
index 1156d70f..4f35035b 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -120,7 +120,8 @@ void main(int argc, char *argv[])
 #endif
 //	printf("Total used @ before palette initiation:		%zu\n", oldfreemem-GetFreeSize());
 //++++	player[0].data.offset=(paloffset/3);
-//++++	modexPalUpdate(&player[0].data, &paloffset, 0, 0);
+//++++	modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
+		modexPalUpdate1(gpal);
 	//printf("	%d\n", sizeof(ptmp->data));
 	//printf("1:	%d\n", paloffset);
 //++++	map.tiles->data->offset=(paloffset/3);
diff --git a/test.exe b/test.exe
index fc3aff03..79335f4e 100755
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index 795e393f..da8490d2 100755
Binary files a/test2.exe and b/test2.exe differ