From: sparky4 <sparky4@cock.li>
Date: Thu, 29 Oct 2015 17:27:41 +0000 (-0500)
Subject: wwwwwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=2eb78909ad7e8079fbec7dbe794fe0eac01e15de;p=16.git

wwwwwww
---

diff --git a/16.exe b/16.exe
index c5814a13..e9b826c7 100755
Binary files a/16.exe and b/16.exe differ
diff --git a/bakapi.exe b/bakapi.exe
index 826a04b2..c1dc4e1d 100755
Binary files a/bakapi.exe and b/bakapi.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index 3c19abdd..3fb55e35 100755
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fmemtest.exe b/fmemtest.exe
index fa7f23df..01aa5079 100755
Binary files a/fmemtest.exe and b/fmemtest.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index 5731cfaa..78118a32 100755
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/fonttest.exe b/fonttest.exe
index 1a6d3db8..245ac55a 100755
Binary files a/fonttest.exe and b/fonttest.exe differ
diff --git a/inputest.exe b/inputest.exe
index abc012c0..df1becf1 100755
Binary files a/inputest.exe and b/inputest.exe differ
diff --git a/maptest.exe b/maptest.exe
index 3c334372..de0a26ee 100755
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/palettec.exe b/palettec.exe
index 541a204f..21f15bbf 100755
Binary files a/palettec.exe and b/palettec.exe differ
diff --git a/palettel.exe b/palettel.exe
index 3cd44e61..f0f993b7 100755
Binary files a/palettel.exe and b/palettel.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index de97e042..597fad83 100755
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/pcxtest2.exe b/pcxtest2.exe
index 8b127a11..7f3ebbd2 100755
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ
diff --git a/planrpcx.exe b/planrpcx.exe
index 53bb91b9..af2dd6a4 100755
Binary files a/planrpcx.exe and b/planrpcx.exe differ
diff --git a/scroll.exe b/scroll.exe
index cd163af1..2ff8350a 100755
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 366d6fa2..63231108 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -413,7 +413,7 @@ void modexDrawPBufRegion	(page_t *page, int x, int y, int rx, int ry, int rw, in
 				//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+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=rw]), rw/4);
+				_fmemcpy(page->data + (((page->width/4) * (y+page->dy)) + ((x+page->dx) / 4)), &(p->plane[plane][i+=p->pwidth]), rw/4);
 			//}
 		}
 		x=px;
@@ -424,7 +424,7 @@ void modexDrawPBufRegion	(page_t *page, int x, int y, int rx, int ry, int rw, in
 
 /*temp*/
 void
-DrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
+modexDrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite)
 {
 	int plane;
 	int i;
diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 5b0d82b0..9c9ea4bb 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -75,7 +75,6 @@ void modexDrawPBuf(page_t *page, int x, int y, planar_buf_t *p, boolean sprite);
 void oldDrawBmp(byte far* page, int x, int y, bitmap_t *bmp, byte sprite);
 void modexDrawBmp(page_t *page, int x, int y, bitmap_t *bmp);
 void modexDrawBmpRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp);
-void modexDrawPlanarBuf(page_t *page, int x, int y, planar_buf_t *bmp);
 void modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp);
 void modexDrawSpriteRegion(page_t *page, int x, int y, int rx, int ry, int rw, int rh, bitmap_t *bmp);
 void modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height);
diff --git a/src/planrpcx.c b/src/planrpcx.c
index 9792a024..dda07176 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -28,8 +28,8 @@
 #include "src/lib/planar.h"
 
 global_game_variables_t gvar;
-bitmap_t bmp;
-planar_buf_t *p;
+bitmap_t bmp, ptmpbt;
+planar_buf_t *p, *ptmp;
 
 void main(int argc, char *argv[])
 {
@@ -57,6 +57,8 @@ baka = 1;
 
 	bmp = bitmapLoadPcx(bakapeee);
 	p = planar_buf_from_bitmap(&bmp);
+	ptmpbt = bitmapLoadPcx("data/ptmp.pcx");
+	ptmp = planar_buf_from_bitmap(&bmp);
 	VGAmodeX(baka, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
@@ -83,9 +85,12 @@ baka = 1;
 // 	t2 = (*clockw-start)/18.2;
 	start = *clockw;
 	for(i=0; i<100 ;i++) {
-		//DrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
+		modexDrawPBuf(&gvar.video.page[0], 0, 0, p, 0);
 	}
 	t2 = (*clockw-start) /18.2;
+	getch();
+	modexPalUpdate1(ptmpbt.palette);
+	modexDrawPBufRegion(&gvar.video.page[0], 140, 140, 48, 32, 24, 32, ptmp, 1);
 	while(!kbhit())
 	{
 	}
diff --git a/src/scroll.c b/src/scroll.c
index 4f35035b..c5280652 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -121,7 +121,7 @@ void main(int argc, char *argv[])
 //	printf("Total used @ before palette initiation:		%zu\n", oldfreemem-GetFreeSize());
 //++++	player[0].data.offset=(paloffset/3);
 //++++	modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
-		modexPalUpdate1(gpal);
+		modexPalUpdate1(p.palette);
 	//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 79335f4e..a5a0ebae 100755
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index da8490d2..e1fc73c8 100755
Binary files a/test2.exe and b/test2.exe differ
diff --git a/tesuto.exe b/tesuto.exe
index 6dbf027e..e475c0f0 100755
Binary files a/tesuto.exe and b/tesuto.exe differ
diff --git a/vgmtest.exe b/vgmtest.exe
index e2a5d709..f822b1ef 100755
Binary files a/vgmtest.exe and b/vgmtest.exe differ