X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2F16.c;h=aaf3f493b66cacf95377fd1a6468f781e51f3b82;hb=ff7ba1d826146a17e98811064334aab9bf2c9a47;hp=a96b1c495de738a594f791d6041a335277a664c4;hpb=93e1ab2e43ce82facb47476d9ee461b0d5beb83e;p=16.git

diff --git a/src/16.c b/src/16.c
index a96b1c49..aaf3f493 100755
--- a/src/16.c
+++ b/src/16.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -22,15 +22,11 @@
 
 #include "src/16.h"
 
-engi_stat_t engi_stat;
-
 void
 main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	Startup16(&gvar);
-
-	engi_stat = ENGI_RUN;
+	Startup16(&gvar);//initgame equ
 
 	/* save the palette */
 	modexPalSave(gvar.video.dpal);
@@ -39,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_EXIT != engi_stat)
+	while(1)
 	{
-		IN_ReadControl(&gvar.player[0]);
-		if(IN_KeyDown(sc_Escape)) engi_stat = ENGI_EXIT;
+		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,4 +50,10 @@ main(int argc, char *argv[])
 	printf("version %s\n", VERSION);
 	WCPU_cpufpumesg();
 	modexFadeOn(4, gvar.video.dpal);
+//	InitGame ();//to be defined in 16_tail
+
+//++++	DemoLoop();//to be defined in 16_tail
+
+//++++	Quit(&gvar, "Demo loop exited???");
+
 }