X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2F0.c;h=051bb332fe8be6ff3e01a5e3d1f84e7a54658b20;hb=424d6f05d9aaa0000302df70be10c2598886a030;hp=ba9ced8030eb1fbd679062c17c7c224f6d2fdf6a;hpb=5c33a30248aff1745430cd0e926c343242e4c889;p=16.git

diff --git a/src/0.c b/src/0.c
index ba9ced80..051bb332 100755
--- a/src/0.c
+++ b/src/0.c
@@ -35,7 +35,6 @@
 #define INITTNUM 1
 
 map_view_t mv[4];
-
 map_t map;//junk var
 
 int main(int argc,char **argv)
@@ -102,14 +101,14 @@ int main(int argc,char **argv)
 	vrl_lineoffs = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
 	if (vrl_lineoffs == NULL) return 1;
 
-	IN_Startup();
-	IN_Default(0,&gvar.player,ctrl_Keyboard1);
-	EN_initPlayer(&gvar.player, 0, &gvar.video);
+	IN_Startup(&gvar);
+	IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);
+	EN_initPlayer(&gvar.player[0], &gvar.video);
 
 	/* setup camera and screen~ */
 	modexHiganbanaPageSetup(&gvar.video);
-	ZC_MVSetup(&mv, &map, &gvar);
-	ZC_ShowMV(&mv, gvar.video.sp, 0);
+	ZC_MVSetup(&gvar.mv, &map, &gvar);
+	ZC_ShowMV(&gvar.mv, gvar.video.sp, 0);
 
 //	VL_PatternDraw(video_t *video, word pn, boolean sw, boolean allsw);
 	VL_PatternDraw(&gvar.video, 0/*gvar.video.sp*/, 0, 1);
@@ -139,20 +138,20 @@ int main(int argc,char **argv)
 		/* do it */
 		omemptr = vga_state.vga_graphics_ram; // save original mem ptr
 
-		while(!IN_KeyDown(sc_Escape))
+		while(!gvar.in.inst->Keyboard[sc_Escape])
 		{
-			IN_ReadControl(0,&gvar.player);
-			if(IN_KeyDown(68)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1,1); } //f10
+			IN_ReadControl(&gvar.player[0], &gvar);
+			if(gvar.in.inst->Keyboard[68]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10
 			TAIL_PANKEYFUN;
-			if(IN_KeyDown(sc_Space) || zerostoppause)	//space
+			if(gvar.in.inst->Keyboard[sc_Space] || zerostoppause)	//space
 			{
 				anim=!anim;
 				DRAWCORNERBOXES;
-				if(!zerostoppause) IN_UserInput(1,1); else zerostoppause=0;
+				if(!zerostoppause) IN_UserInput(1, &gvar); else zerostoppause=0;
 			}
-			if(IN_KeyDown(sc_R)){
+			if(gvar.in.inst->Keyboard[sc_R]){
 				gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;
-				mv[0].tx = mv[0].ty = mv[1].tx = mv[1].ty = INITTNUM;
+				gvar.mv[0].tx = gvar.mv[0].ty = gvar.mv[1].tx = gvar.mv[1].ty = INITTNUM;
 				VL_ShowPage(&gvar.video.page[gvar.video.sp], 1, 0);
 				gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2;
 				x=y=0;
@@ -214,11 +213,11 @@ draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header
 		}
 	}
 
-	IN_UserInput(1,1);
+	IN_UserInput(1, &gvar);
 
 //===========================================================================//
 
-	ZC_ShowMV(&mv, 0, 0);
+	ZC_ShowMV(&gvar.mv, 0, 0);
 if(!noanim) {
 	/* another handy "demo" effect using VGA write mode 1.
 	 * we can take what's on screen and vertically squash it like an old analog TV set turning off. */
@@ -302,7 +301,7 @@ if(!noanim) {
 		}
 	}
 }
-	IN_Shutdown();
+	IN_Shutdown(&gvar);
 	VGAmodeX(0, 1, &gvar);
 	free(vrl_lineoffs);
 	buffer = NULL;
@@ -313,7 +312,7 @@ if(!noanim) {
 	printf("\nProject 16 0.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
 	//SCROLLEXITMESG;
-	printf("mv 0\n- tx=%d	ty=%d	dx=%d	dy=%d\n", mv[0].tx, mv[0].ty, gvar.video.page[0].dx, gvar.video.page[0].dy);
-	printf("mv 1\n- tx=%d	ty=%d	dx=%d	dy=%d\n", mv[1].tx, mv[1].ty, gvar.video.page[1].dx, gvar.video.page[1].dy);
+	printf("mv 0\n- tx=%d	ty=%d	dx=%d	dy=%d\n", gvar.mv[0].tx, gvar.mv[0].ty, gvar.video.page[0].dx, gvar.video.page[0].dy);
+	printf("mv 1\n- tx=%d	ty=%d	dx=%d	dy=%d\n", gvar.mv[1].tx, gvar.mv[1].ty, gvar.video.page[1].dx, gvar.video.page[1].dy);
 	return 0;
 }