X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ftest.c;h=785e011097eb0b4a6ded5f978463ab193dcf766b;hb=af2715fef8681d909afe82f7baaf5e13baabb76f;hp=cfbd462c73653d240a79b8ff0a35f44b0ef2564e;hpb=414f8943ce83290e937ad2fa93a01154360b3af5;p=16.git

diff --git a/src/test.c b/src/test.c
index cfbd462c..785e0110 100755
--- a/src/test.c
+++ b/src/test.c
@@ -100,7 +100,7 @@ void main(int argc, char *argv[])
 	//====modexPalBlack();
 
 	//IN_Startup();
-	IN_Default(0,&gvar.player[0],ctrl_Keyboard1);
+	IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);
 	EN_initPlayer(&gvar.player[0], &gvar.video);
 
 	VGAmodeX(1, 1, &gvar);
@@ -122,7 +122,7 @@ void main(int argc, char *argv[])
 
 	/* set up the page, but with 16 pixels on all borders in offscreen mem */
 	modexHiganbanaPageSetup(&gvar.video);
-	ZC_MVSetup(&MVVAR, &map, &gvar);
+	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);
@@ -149,8 +149,8 @@ void main(int argc, char *argv[])
 	startclk = *clockw;
 	while(!IN_KeyDown(sc_Escape))
 	{
-		IN_ReadControl(&gvar.player[0]);
-		ZC_panPageManual(&MVVAR, &gvar.player, 0);
+		IN_ReadControl(&gvar.player[0], &gvar);
+		ZC_panPageManual(&gvar.mv, &gvar.player, 0);
 //			if(IN_KeyDown(sc_5)){ modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45); }
 // 			if(IN_KeyDown(sc_4)){
 // 				modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);
@@ -170,11 +170,11 @@ void main(int argc, char *argv[])
 			}
 //			if(i>PAL_SIZE) i=0;
 		}//9*/
-		if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[gvar.video.sp]); IN_UserInput(1); }//p
-		if(IN_KeyDown(sc_I)){ drawboxesmodex(&gvar.video.page[gvar.video.sp]); IN_UserInput(1); }//i
-		if(IN_KeyDown(sc_O)){ copyboxesmodex(&gvar.video.page, !gvar.video.sp); IN_UserInput(1); }//o
+		if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//p
+		if(IN_KeyDown(sc_I)){ drawboxesmodex(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//i
+		if(IN_KeyDown(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(&MVVAR, 0, 0);
+		ZC_ShowMV(&gvar.mv, 0, 0);
 	}
 
 	endclk = *clockw;
@@ -187,7 +187,7 @@ void main(int argc, char *argv[])
 	printf("Project 16 test.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
 	VL_PrintmodexmemInfo(&gvar.video);
-	printf("tx=%d	", MVVAR[gvar.video.sp].tx); printf("ty=%d	", MVVAR[gvar.video.sp].ty); printf("gvar.player.d=%d\n", gvar.player[0].enti.d);
+	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");