X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ftest.c;h=2c698a63327d5217413cfd335b6911a3ca88a045;hb=9fae6d1ef0ebd44690958e072f400edde9262208;hp=89f1d0ff1fceef502ca45379d3807d257e0df822;hpb=1ff7522be9df2fd844d372e4a3f510a1bc9a5519;p=16.git

diff --git a/src/test.c b/src/test.c
index 89f1d0ff..2c698a63 100755
--- a/src/test.c
+++ b/src/test.c
@@ -27,7 +27,7 @@
 
 global_game_variables_t gvar;
 player_t player[MaxPlayers];
-map_view_t mv[2];
+map_view_t mv[4];
 pan_t pan;
 
 void main(int argc, char *argv[])
@@ -64,6 +64,13 @@ void main(int argc, char *argv[])
 		return;
 	}
 
+	if (_DEBUG_INIT() == 0) {
+#ifdef DEBUGSERIAL
+		printf("WARNING: Failed to initialize DEBUG output\n");
+#endif
+	}
+	_DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log
+
 	/* load our palette */
 	modexLoadPalFile("data/default.pal", &pal2);
 
@@ -74,7 +81,8 @@ void main(int argc, char *argv[])
 	modexPalBlack();
 
 	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
+	IN_Default(0,&player,ctrl_Keyboard1);
+	IN_initplayer(&player, 0);
 
 	textInit();
 	VGAmodeX(bakapee, 1, &gvar);
@@ -82,26 +90,32 @@ void main(int argc, char *argv[])
 
 	/* set up the page, but with 16 pixels on all borders in offscreen mem */
 	modexHiganbanaPageSetup(&gvar.video);
-	for(i=0;i<gvar.video.num_of_pages-2;i++)
+	for(i=0;i<gvar.video.num_of_pages;i++)
 	{
 		mv[i].page = &gvar.video.page[i];
 		mv[i].video = &gvar.video;
 		mv[i].pan	= &pan;
+		mv[i].tx	= 0;
+		mv[i].ty	= 0;
 	}
-// 	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
-// 	gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);
-// 	gvar.video.page[0].width += 32;
-// 	gvar.video.page[0].height += 32;
+//  	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
+//  	gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);
 
 
 	/* fill the page with one color, but with a black border */
+	modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[1].width, gvar.video.page[1].height, 15);
+	modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);
+	modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);
+	modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
 	modexShowPage(&gvar.video.page[1]);
-	//modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 0);
+	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15);
 	modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128);
 	modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42);
 	modexClearRegion(&gvar.video.page[0], 48, 48, gvar.video.page[0].sw-64, gvar.video.page[0].sh-64, 128);
 	modexShowPage(&gvar.video.page[0]);
-	modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width+32, gvar.video.page[0].height);
+	modexCopyPageRegion(&gvar.video.page[1], &gvar.video.page[0], 0, 0, 0, 0, gvar.video.page[0].width, gvar.video.page[0].height);
+	modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 47);
+	modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 45);
 
 	/* fade in */
 	modexFadeOn(1, pal2);
@@ -111,28 +125,30 @@ void main(int argc, char *argv[])
 	while(!IN_KeyDown(sc_Escape))
 	{
 		IN_ReadControl(0,&player);
-		if(i<5){
+		panpagemanual(mv, player, 0);
+
+		/*if(i<5){
 		switch (k)
 		{
 			case 0:
 				pee:
-				/* go right */
+				// go right
 				gvar.video.page[pan.pn].dx++;
 				if(i==5){ if(j>=31){ i++; j=0; goto baka; }else j++; }else
 				if(j>=32){ k++; j=0; }else j++;
 			break;
 			case 1:
-				/* go left */
+				// go left
 				gvar.video.page[pan.pn].dx--;
 				if(j>=32){ k++; j=0; }else j++;
 			break;
 			case 2:
-				/* go up */
+				// go up
 				gvar.video.page[pan.pn].dy++;
 				if(j>=32){ k++; j=0; }else j++;
 			break;
 			case 3:
-				/* go down */
+				// go down
 				gvar.video.page[pan.pn].dy--;
 				if(j>=32){ k=0; j=0; i++; }else j++;
 			break;
@@ -143,18 +159,24 @@ void main(int argc, char *argv[])
 			if(i==5) goto pee;
 			baka:
 			i++;
-			modexClearRegion(&gvar.video.page[1], 0, gvar.video.page[0].height/2, gvar.video.page[0].width-32, 16, 45);
-			if(IN_KeyDown(6)) modexClearRegion(&gvar.video.page[1], 0, gvar.video.page[0].height/2, gvar.video.page[0].width, 16, 45);
-			if(IN_KeyDown(4+1)){
-				modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);
-				modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);
-				modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
-			}
-			panpagemanual(mv, player, 0);
-		}
-		if(IN_KeyDown(2)) pan.pn=0;
-		if(IN_KeyDown(3)) pan.pn=1;
-		//if(IN_KeyDown(6)) modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[0].sw-64, gvar.video.page[0].sh-16, 45);
+			modexClearRegion(&gvar.video.page[1], 0, gvar.video.page[0].height/2, gvar.video.page[0].width-32, 16, 45);*/
+// 			if(IN_KeyDown(6))
+// 			{
+// 				modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45);
+// 			}
+// 			if(IN_KeyDown(4+1)){
+// 				modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);
+// 				modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);
+// 				modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);
+// 			}
+		//}
+		if(IN_KeyDown(1+1)) pan.pn=0;
+		if(IN_KeyDown(2+1)) pan.pn=1;
+		if(IN_KeyDown(3+1)) pan.pn=2;
+		if(IN_KeyDown(4+1)) pan.pn=3;
+		if(IN_KeyDown(25)){
+			modexpdump(&gvar.video.page[pan.pn]);
+		}//p
 		modexShowPage(&gvar.video.page[pan.pn]);
 	}
 
@@ -166,15 +188,8 @@ void main(int argc, char *argv[])
 	VGAmodeX(0, 1, &gvar);
 	printf("Project 16 test.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
-	printf("video memory remaining: %ld\n", gvar.video.vmem_remain);
-	printf("page ");
-	for(i=0; i<gvar.video.num_of_pages;i++)
-	{
-		printf("	[%u]=", i);
-		printf("(%Fp)", (gvar.video.page[i].data));
-		printf(" size=%ld", gvar.video.page[i].pagesize);
-		printf("\n");
-	}
+	modexprintmeminfo(&gvar.video);
+	printf("tx=%d	", mv[pan.pn].tx); printf("ty=%d	", mv[pan.pn].ty); printf("player.d=%d\n", player[0].d);
 	IN_Shutdown();
 	modexPalBlack();
 	modexFadeOn(1, pal);