X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest.c;h=bb3792ae16919090c0b3f6f6b1176b6494e7c4d3;hb=6b164d70a5927e8955b1e0869c4ad32d63410d00;hp=515c5f63a39400b59bbbfa05629131cbe28123f1;hpb=b40411c754cec4dc88f6a4183f475584b9205a2b;p=16.git

diff --git a/src/test.c b/src/test.c
index 515c5f63..bb3792ae 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,14 @@ 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
+	_DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);
+
 	/* load our palette */
 	modexLoadPalFile("data/default.pal", &pal2);
 
@@ -96,6 +104,10 @@ void main(int argc, char *argv[])
 
 
 	/* 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, 15);
 	modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128);
@@ -103,6 +115,8 @@ void main(int argc, char *argv[])
 	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, 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);
@@ -147,18 +161,20 @@ void main(int argc, char *argv[])
 			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],  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(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(2)) pan.pn=0;
-		if(IN_KeyDown(3)) pan.pn=1;
+		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