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

diff --git a/src/0.c b/src/0.c
index 28d5ff05..051bb332 100755
--- a/src/0.c
+++ b/src/0.c
@@ -101,8 +101,8 @@ 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[0],ctrl_Keyboard1);
+	IN_Startup(&gvar);
+	IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);
 	EN_initPlayer(&gvar.player[0], &gvar.video);
 
 	/* setup camera and screen~ */
@@ -138,18 +138,18 @@ 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(&gvar.player[0]);
-			if(IN_KeyDown(68)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(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); 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;
 				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);
@@ -213,7 +213,7 @@ draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header
 		}
 	}
 
-	IN_UserInput(1);
+	IN_UserInput(1, &gvar);
 
 //===========================================================================//
 
@@ -301,7 +301,7 @@ if(!noanim) {
 		}
 	}
 }
-	IN_Shutdown();
+	IN_Shutdown(&gvar);
 	VGAmodeX(0, 1, &gvar);
 	free(vrl_lineoffs);
 	buffer = NULL;