From: sparky4 <sparky4@cock.li>
Date: Wed, 11 Nov 2015 12:49:00 +0000 (-0600)
Subject: wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=b85e69ad19bcc1ef45494d60b2ffd47fc2eeb4a3;p=16.git

wwww
---

diff --git a/16.exe b/16.exe
index c3d8e5ee..95def1e1 100755
Binary files a/16.exe and b/16.exe differ
diff --git a/_scroll.exe b/_scroll.exe
deleted file mode 100755
index 4052f6db..00000000
Binary files a/_scroll.exe and /dev/null differ
diff --git a/bakapi.exe b/bakapi.exe
index 1a507b42..4287ce85 100755
Binary files a/bakapi.exe and b/bakapi.exe differ
diff --git a/bcexmm.exe b/bcexmm.exe
deleted file mode 100755
index 04bf4475..00000000
Binary files a/bcexmm.exe and /dev/null differ
diff --git a/exmmtest.exe b/exmmtest.exe
index 2b7249fc..55a7fee6 100755
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fmemtest.exe b/fmemtest.exe
index 7a35aaf9..f9f137f9 100755
Binary files a/fmemtest.exe and b/fmemtest.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index 4843f2a6..170579ff 100755
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/fonttest.exe b/fonttest.exe
index 256aed67..1cb340c7 100755
Binary files a/fonttest.exe and b/fonttest.exe differ
diff --git a/inputest.exe b/inputest.exe
index caf53e60..ee9f5ae1 100755
Binary files a/inputest.exe and b/inputest.exe differ
diff --git a/maptest.exe b/maptest.exe
index 5f6fc22f..3e3ac1dc 100755
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/mem.exe b/mem.exe
deleted file mode 100755
index c9238f77..00000000
Binary files a/mem.exe and /dev/null differ
diff --git a/memstat.exe b/memstat.exe
deleted file mode 100755
index 637241d8..00000000
Binary files a/memstat.exe and /dev/null differ
diff --git a/midi.exe b/midi.exe
deleted file mode 100755
index cb05f678..00000000
Binary files a/midi.exe and /dev/null differ
diff --git a/palettec.exe b/palettec.exe
index c380c0df..c1d025e0 100755
Binary files a/palettec.exe and b/palettec.exe differ
diff --git a/palettel.exe b/palettel.exe
index 6ec2033d..3e4befcd 100755
Binary files a/palettel.exe and b/palettel.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index 243a291e..c1a36c10 100755
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/pcxtest2.exe b/pcxtest2.exe
index e9ce5a47..3547f4a3 100755
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ
diff --git a/planrpcx.exe b/planrpcx.exe
index e0a26c62..d61bbdde 100755
Binary files a/planrpcx.exe and b/planrpcx.exe differ
diff --git a/scroll.exe b/scroll.exe
index 81475de4..93eb5005 100755
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/16.c b/src/16.c
index c9cd55d5..c4367aa9 100755
--- a/src/16.c
+++ b/src/16.c
@@ -49,7 +49,7 @@ main(int argc, char *argv[])
 	modexPalBlack();	//so player will not see loadings~
 	IN_Startup();
 	IN_Default(0,&player,ctrl_Joystick);
-	//modexprint(&screen, 32, 32, 1, 2, 0, "a");
+	//modexprint(&screen, 32, 32, 1, 2, 0, "a", 1);
 	while(ENGI_EXIT != engi_stat)
 	{
 		IN_ReadControl(0,&player);
diff --git a/src/fontgfx.c b/src/fontgfx.c
index db5bfa9f..edea863e 100755
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -81,10 +81,10 @@ IIIIIII  BBBBBBBBB    MMMM    M    MMMM\n\
 			chx=0;
 			chy+=8;
 			sprintf(pee,"%u", colpee);
-			modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee);
+			modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee, 1);
 			//getch();
 		}
-		modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e);
+		modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e, 1);
 		chx+=9;
 		colpee++;
 		if(colpee>=32+24) colpee=32;
diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index 9b500b91..040db6f9 100755
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -232,7 +232,7 @@ void ding(page_t *page, bakapee_t *pee, word q)
 		break;
 		case 8:
 			colorz(page, pee);
-			modexprint(page, page->sw/2, page->sh/2, 1, 47, 0, "bakapi");
+			modexprint(page, page->sw/2, page->sh/2, 1, 47, 0, "bakapi", 1);
 		break;
 		case 9:
 			if(pee->coor <= HGQ)
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 5248a6b3..8637d711 100755
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -952,13 +952,14 @@ void modexhlin(page_t *page, word xl, word xh, word y, word color)
 	//modexputPixel(page, x+xl, y, color);
 }
 
-void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)
+void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, boolean q)
 {
-	word i, s, o, w, j, xp;
+	word i, s, o, w, j, k, xp;
 	byte l[1024];
 	word addr = (word) l;
 	word chw=0;
 	byte c;
+	byte z[10];
 	//byte near *bakapee;
 
 	switch(t)
@@ -1021,14 +1022,32 @@ void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, cons
 			*bakapee=(l[i] & j ? col:bgcol);
 			_fmemcpy(page->data + (((page->width/4) * (y+page->dy+i)) + ((x+page->dx+chw) / 4)), bakapee, 8);*/
 			j=1<<8;
+			k=0;
 			xp=0;
+			//every "pixel" row
 			while(j)
 			{
+				if(q)
+				//_fmemcpy(page->data + (((page->width/4) * (y)) + ((x) / 4)), l[i] & j ? col:bgcol, 8);
 				modexputPixel(page, x+xp+chw, y+i, l[i] & j ? col:bgcol);
+				else
+					//printf("l[i]=%c j=%02u l[i] & j=%02u %c\n", l[i] , j, l[i] & j, l[i] & j ? '*':' ');
+					//printf("%c", l[i] & j ? '*':' ');
+					z[k]=l[i] & j ? '*':' ';
 				xp++;
 				j>>=1;
+				k++;
+			}
+			if(!q)
+			{
+				for(k=0;k<10;k++)
+				{
+					printf("%c", z[k]);
+				}
+				printf("\n");
 			}
 		}
+		if(!q) getch();
 		chw += xp;
 	}
 	//_nfree(bakapee);
diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 81f24bea..5a2655d6 100755
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -119,7 +119,7 @@ void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, wor
 void modexputPixel(page_t *page, int x, int y, byte color);
 byte modexgetPixel(page_t *page, int x, int y);
 void modexhlin(page_t *page, word xl, word xh, word y, word color);
-void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
+void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str, boolean q);
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);
 void pdump(page_t *pee);
 void cls(page_t *page, byte color, byte *Where);
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 4d94e86c..ec8c7d41 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -598,7 +598,7 @@ void shinku(map_view_t *pip, global_game_variables_t *gv)
 		word type = 1;
 		//t=(((*(gv->clock))-gv->clock_start) /18.2);
 		sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
-		modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee);
+		modexprint(pip[1].page, 16, 16, 1, 15, 0, gv->pee, 1);
 		//(gv->clock_start)=*(gv->clock);
 		gv->kurokku.tiku=0;
 	}
diff --git a/src/planrpcx.c b/src/planrpcx.c
index bf671423..408b089a 100755
--- a/src/planrpcx.c
+++ b/src/planrpcx.c
@@ -36,11 +36,14 @@ word px,py;
 sword baka;
 char *bakapeee;
 
+
 void main(int argc, char *argv[])
 {
 
-	//byte l[1024];
-	word j,chw,xp,col,bgcol;
+	byte l[1024];
+	static byte e;
+	static word chx, chy, colpee;
+	byte pee[2];
 
 //w=0;
 //printf("%u ", w++);
@@ -60,6 +63,7 @@ baka = 1;
 //fprintf(stderr, "^^;", w++);
 //getch();
 
+	textInit();
 	VGAmodeX(baka, &gvar);
 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
 
@@ -119,28 +123,26 @@ getch();
 			printf("\n");
 		}
 	}
-	col=0x0d, bgcol=0;
-	/*
-	for(i=0; i<8; i++)
+
+	chx=0;
+	chy=0;
+	colpee=32;
+	for(e=0x00; e<=0xFE; e++)
 	{
-		//modexSelectPlane(PLANE(x));
-		//j=1<<8;
-		//*bakapee=(l[i] & j ? col:bgcol);
-		//_fmemcpy(page->data + (((page->width/4) * (y+page->dy+i)) + ((x+page->dx+chw) / 4)), bakapee, 8);
-		j=4<<8;
-		fprintf(stderr, "j<<=%u\n", j);
-		xp=0;
-		while(j)
+		if(chx+8>(gvar.video.page[0].width/2))
 		{
-			//modexputPixel(page, x+xp+chw, y+i, l[i] & j ? col:bgcol);
-			//fprintf(stderr, "%u", l[i] & j ? col:bgcol);
-			xp++;
-			j>>=4;
-			fprintf(stderr, "	j>>=%u\n", j);
+			chx=0;
+			chy+=8;
+			sprintf(pee,"%u", colpee);
+			modexprint(&gvar.video.page[0], 200, 200, 1, 47, 0, &pee, 0);
+			//getch();
 		}
-		//fprintf(stderr, "\n");
-	}*/
-	chw += xp;
+		modexprint(&gvar.video.page[0], chx, chy, 1, 0, colpee, &e, 0);
+		chx+=9;
+		colpee++;
+		if(colpee>=32+24) colpee=32;
+	}
+
 	fprintf(stderr,"Project 16 planrpcx.exe. This is just a test file!\n");
 	fprintf(stderr,"version %s\n", VERSION);
 	fprintf(stderr,"%d\n", sizeof(p.plane));
diff --git a/test.exe b/test.exe
index d171a7c4..fc06f0f3 100755
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index db19c6b5..dd5521c2 100755
Binary files a/test2.exe and b/test2.exe differ
diff --git a/tesuto.exe b/tesuto.exe
index e475c0f0..6dbf027e 100755
Binary files a/tesuto.exe and b/tesuto.exe differ
diff --git a/vgmtest.exe b/vgmtest.exe
index 335f9668..343c65b4 100755
Binary files a/vgmtest.exe and b/vgmtest.exe differ
diff --git a/zroll.exe b/zroll.exe
deleted file mode 100755
index 7de0e452..00000000
Binary files a/zroll.exe and /dev/null differ