X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvidtest.c;h=d6db28ccfbd34fcceba8170ff54219ab2e3fbdf9;hb=2fc6c650cc91ba3a4447630286d9aa4bb92bbfda;hp=8995f1d857b224a49a5f19aa357a309e0fa62997;hpb=77dd79155f6eae0d3a31fb792fd785f93ba72454;p=16.git

diff --git a/src/vidtest.c b/src/vidtest.c
index 8995f1d8..d6db28cc 100755
--- a/src/vidtest.c
+++ b/src/vidtest.c
@@ -46,52 +46,13 @@ void copyboxesmodex(page_t *page, boolean pn)
 
 void main(int argc, char *argv[])
 {
-	static word paloffset=0;
 	static global_game_variables_t gvar;
-
-//	map_view_t mv[4];
 	map_t map;
 
 	int i, j;
 	word startclk, endclk;
 	word k;
 
-	imgtestpal_t bmp1, bmp2;
-
-
-	bmp1.width=bmp2.width=	40;
-	bmp1.width=bmp2.height=	30;
-
-	//====word colo=LGQ;
-
-	// DOSLIB: check our environment
-	/*probe_dos();
-
-	// DOSLIB: what CPU are we using?
-	// NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.
-	//      So this code by itself shouldn't care too much what CPU it's running on. Except that other
-	//      parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for
-	//      the CPU to carry out tasks. --J.C.
-	cpu_probe();
-
-	// DOSLIB: check for VGA
-	if (!probe_vga()) {
-		printf("VGA probe failed\n");
-		return;
-	}
-	// hardware must be VGA or higher!
-	if (!(vga_state.vga_flags & VGA_IS_VGA)) {
-		printf("This program requires VGA or higher graphics hardware\n");
-		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);*/
 	Startup16(&gvar);
 
 	/* save the palette */
@@ -108,14 +69,6 @@ void main(int argc, char *argv[])
 
 	/* load our palette */
 	VL_LoadPalFile("data/16.pal", &gvar.video.palette, &gvar);
-	bmp1.offset=(paloffset/3);
-	VL_palette(&bmp1, &gvar.video.palette, &paloffset, 0, 0, &gvar);
-
-	//VL_LoadPalFilewithoffset("data/default.pal", &palette, paloffset);
-	modexLoadPalFile("data/16t.pal", &gvar.video.dpal);
-	bmp2.offset=(paloffset/3);
-	VL_palette(&bmp2, &gvar.video.dpal, &paloffset, 0, 0, &gvar);
-	//====modexLoadPalFile("data/default.pal", &pal2);
 
 	/* overscan show */
 	//modexPalOverscan(44+1);
@@ -125,17 +78,6 @@ void main(int argc, char *argv[])
 	ZC_MVSetup(&gvar.mv, &map, &gvar);
 
 	/* 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);
-	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]);*/
-
 	drawboxesmodex(&gvar.video.page[0]);
 	copyboxesmodex(&gvar.video.page, 1);
 	modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 4);
@@ -160,21 +102,12 @@ void main(int argc, char *argv[])
 		TAIL_PANKEYFUN;
 		if(gvar.in.inst->Keyboard[12]) modexClearRegion(&gvar.video.page[0], (gvar.video.page[0].width/2)-4, (gvar.video.page[0].height/2)-16, 24, 32, 15);
 		if(gvar.in.inst->Keyboard[13]) modexClearRegion(&gvar.video.page[1], (gvar.video.page[1].width/2)-4, (gvar.video.page[1].height/2)-16, 24, 32, 15);
-/*====		if(gvar.in.inst->Keyboard[7)){
-			for(i=0;i<3;i++)
-			{
-				pal2[i] = rand()%64;
-				modexPalUpdate(pal2);
-				colo++;
-				if(colo>HGQ) colo=LGQ;
-			}
-//			if(i>PAL_SIZE) i=0;
-		}//9*/
-		if(gvar.in.inst->Keyboard[25]){ modexpdump(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//p
+
+		if(gvar.in.inst->Keyboard[25]){ modexpdump(gvar.video.sp, &gvar); IN_UserInput(1, &gvar); }//p
 		if(gvar.in.inst->Keyboard[sc_I]){ drawboxesmodex(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//i
 		if(gvar.in.inst->Keyboard[sc_O]){ copyboxesmodex(&gvar.video.page, !gvar.video.sp); IN_UserInput(1, &gvar); }//o
-		//VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);
-		ZC_ShowMV(&gvar.mv, 0, 0);
+		VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);
+		//ZC_ShowMV(&gvar.mv, 0, 0);
 	}
 
 	endclk = *clockw;
@@ -188,9 +121,6 @@ void main(int argc, char *argv[])
 	printf("version %s\n", VERSION);
 	VL_PrintmodexmemInfo(&gvar.video);
 	printf("tx=%d	", gvar.mv[gvar.video.sp].tx); printf("ty=%d	", gvar.mv[gvar.video.sp].ty); printf("gvar.player.d=%d\n", gvar.player[0].enti.d);
-	printf("\n====\n");
-	printf("0	paloffset=	%d\n", paloffset/3);
-	printf("====\n\n");
 	//IN_Shutdown();
 	//====modexPalBlack();
 	//====modexFadeOn(1, pal);