X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2F16.c;h=004d8ebfae51c196750b4b232cfd3c0e5c16e301;hb=3e49e24d51e5a253c8bd3caaa447150d009ea85d;hp=4fda90d41c74e9c990b3b6d4d94ba65a7ed9ee6c;hpb=c99bda70e2b46d085d3ba7aa951117bcd737c208;p=16.git

diff --git a/src/16.c b/src/16.c
index 4fda90d4..004d8ebf 100755
--- a/src/16.c
+++ b/src/16.c
@@ -26,9 +26,7 @@ void
 main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	Startup16(&gvar);
-
-	gvar.engi_stat = ENGI_RUN;
+	Startup16(&gvar);//initgame equ
 
 	/* save the palette */
 	modexPalSave(gvar.video.dpal);
@@ -37,12 +35,12 @@ main(int argc, char *argv[])
 	modexSavePalFile("data/g.pal", gvar.video.palette);
 	VGAmodeX(1, 1, &gvar);
 //	modexPalBlack();	//so player will not see loadings~
-	IN_Default(0,&gvar.player[0],ctrl_Joystick);
+	IN_Default(0,&gvar.player[0],ctrl_Joystick, &gvar);
 	//modexprint(&screen, 32, 32, 1, 2, 0, "a", 1);
-	while(ENGI_QUIT != gvar.engi_stat)
+	while(1)
 	{
-		IN_ReadControl(&gvar.player[0]);
-		if(IN_KeyDown(sc_Escape)) gvar.engi_stat = ENGI_QUIT;
+		IN_ReadControl(&gvar.player[0], &gvar);
+		if(gvar.in.inst->Keyboard[sc_Escape]) break;
 		shinku(&gvar);
 		_DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);
 	}
@@ -54,8 +52,8 @@ main(int argc, char *argv[])
 	modexFadeOn(4, gvar.video.dpal);
 //	InitGame ();//to be defined in 16_tail
 
-//	DemoLoop();//to be defined in 16_tail
+//++++	DemoLoop();//to be defined in 16_tail
 
-//	Quit("Demo loop exited???");
+//++++	Quit(&gvar, "Demo loop exited???");
 
 }