X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2F16.c;h=af711c37aa1d794319d6f6351b0ab87f0dc9d4d6;hb=af2715fef8681d909afe82f7baaf5e13baabb76f;hp=d2072fcb1c640eb485325e2654563f150948d768;hpb=17ec26395419ff775f29661e50265dfbccfda3b0;p=16.git

diff --git a/src/16.c b/src/16.c
index d2072fcb..af711c37 100755
--- a/src/16.c
+++ b/src/16.c
@@ -22,33 +22,27 @@
 
 #include "src/16.h"
 
-engi_stat_t engi_stat;
-byte *dpal, *gpal;
-player_t player[MaxPlayers];
-
 void
 main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
 	Startup16(&gvar);
 
-	engi_stat = ENGI_RUN;
+	gvar.engi_stat = ENGI_RUN;
 
 	/* save the palette */
-	dpal = modexNewPal();
-	modexPalSave(dpal);
-	modexFadeOff(4, dpal);
-	gpal = modexNewPal();
-	modexPalSave(gpal);
-	modexSavePalFile("data/g.pal", gpal);
+	modexPalSave(gvar.video.dpal);
+	modexFadeOff(4, gvar.video.dpal);
+	modexPalSave(gvar.video.palette);
+	modexSavePalFile("data/g.pal", gvar.video.palette);
 	VGAmodeX(1, 1, &gvar);
 //	modexPalBlack();	//so player will not see loadings~
-	IN_Default(0,&player,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(ENGI_QUIT != gvar.engi_stat)
 	{
-		IN_ReadControl(0,&player);
-		if(IN_KeyDown(sc_Escape)) engi_stat = ENGI_EXIT;
+		IN_ReadControl(&gvar.player[0], &gvar);
+		if(IN_KeyDown(sc_Escape)) gvar.engi_stat = ENGI_QUIT;
 		shinku(&gvar);
 		_DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);
 	}
@@ -57,5 +51,11 @@ main(int argc, char *argv[])
 	printf("Project 16 16.exe. This is supposed to be the actual finished game executable!\n");
 	printf("version %s\n", VERSION);
 	WCPU_cpufpumesg();
-	modexFadeOn(4, dpal);
+	modexFadeOn(4, gvar.video.dpal);
+//	InitGame ();//to be defined in 16_tail
+
+//	DemoLoop();//to be defined in 16_tail
+
+//	Quit("Demo loop exited???");
+
 }