X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fxcroll.c;h=9e968ae5ef7d47dea439277eb7f3c0de3364977d;hb=3e67fca24b59811ced65929a140f6c242b161d90;hp=7b97a9af19ff771627eca2938986882903bf69a9;hpb=23c4d02d9d36e5c5aa030fa5d1413d1558fc8af0;p=16.git

diff --git a/src/xcroll.c b/src/xcroll.c
index 7b97a9af..9e968ae5 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,7 +22,6 @@
 
 #include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
-#include "src/lib/16render.h"
 #include "src/lib/16_dbg.h"
 
 #define FADE
@@ -52,29 +51,15 @@ memptr pal;
 void main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	struct glob_game_vars	*ggvv;
-//	sword bakapee;
-// 	if(argv[1]) bakapee = atoi(argv[1]);
-// 	else bakapee = 1;
-	//char *bakapee1,*bakapee1p;
+	struct glob_game_vars *ggvv;
 	char bakapee1[64] = FILENAME_1;
 	char bakapee1p[64] = FILENAME_1P;
 
 	Startup16(&gvar);
 
-//	bakapee1=mALLoc(64);
-//	bakapee1p=mALLoc(64);
 	ggvv=&gvar;
 
 	if (argc >= 2) {
-/*	if (argc < 2) {
-		//fprintf(stderr,"drawvrl <VRL file> <palette file>\n palette file optional\n");
-		bakapee1 =		FILENAME_1;
-		bakapee1p =	FILENAME_1P;
-
-	}else{
-		if(argv[1]) bakapee1 = argv[1];
-		if(argv[2]) bakapee1p = argv[2];*/
 		if(argv[1]){ strcpy(bakapee1, argv[1]);
 		if(argv[2]) strcpy(bakapee1p, argv[2]); }
 	}
@@ -125,13 +110,22 @@ void main(int argc, char *argv[])
 #ifdef FADE
 	modexPalSave(&gvar.video.palette);
 	modexSavePalFile("data/g.pal", &gvar.video.palette);
-	modexPalBlack();	//so gvar.player will not see loadings~
+	modexPalBlack();	//so player will not see loadings~
 #endif
 
 	// setup camera and screen~
-	modexHiganbanaPageSetup(&gvar.video);
+	modexHiganbanaPageSetup(&gvar);
 	ZC_MVSetup(&gvar.mv, &map, &gvar);
 
+#ifdef FADE
+	modexFadeOn(4, &gvar.video.palette);
+#endif
+
+//	IN_StartAck (&gvar);	MM_ShowMemory(&gvar);	while (!IN_CheckAck (&gvar)){}
+#ifdef FADE
+	modexPalBlack();	//so player will not see loadings~
+#endif
+
 	// set up paging
 	//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
 	mapGoTo(&gvar.mv, 0, 0);
@@ -153,6 +147,7 @@ void main(int argc, char *argv[])
 //	while(!gvar.in.inst->Keyboard[sc_Escape) && !gvar.in.inst->Keyboard[sc_Space) && !gvar.in.inst->Keyboard[sc_Enter]){ FUNCTIONKEYSHOWMV }
 	gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
 	gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;
+
 	shinku(&gvar);
 //modexpdump(gvar.mv[0].page);
 #ifdef FADE