X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fxcroll.c;h=189746da75d57715901c6c94461eae4e11532921;hb=050d28da3358d5c1434fda542ec11adbee182ea5;hp=c968bdf6a76270d950863cf5c6748fdcc78df0a7;hpb=33b8360be4b8b99cdba25603cb9e85f39aae8fba;p=16.git

diff --git a/src/xcroll.c b/src/xcroll.c
index c968bdf6..189746da 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]); }
 	}
@@ -84,15 +69,16 @@ void main(int argc, char *argv[])
 	//----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));
 
 	// create the map
-#ifndef NOMAPLOAD
 //	fprintf(stderr, "testing map load~	");
 	CA_loadmap("data/test.map", &map, &gvar);
+#ifndef NOMAPLOAD
 	chkmap(&map, 0);
 //	initMap(&map);
 //	printf("chkmap ok	");
 //	fprintf(stderr, "yay map loaded~~\n");
 #else
-	initMap(&map);
+	chkmap(&map, 1);
+	//initMap(&map);
 #endif
 	// data
 	VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);
@@ -107,7 +93,8 @@ void main(int argc, char *argv[])
 	modexPalBlack();
 #endif
 
-	VGAmodeX(1/*bakapee*/, 1, &gvar);
+	//--VGAmodeX(1/*bakapee*/, 1, &gvar);
+	VL_Startup(&gvar);
 
 	/* load color palette */
 	/*ptmp.offset=(paloffset/3);
@@ -117,19 +104,28 @@ void main(int argc, char *argv[])
 	//printf("1:	%d\n", paloffset);
 	map.tiles->data->offset=(paloffset/3);
 	modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/
-	VL_LoadPalFile(bakapee1p, &gvar.video.palette);
+	VL_LoadPalFile(bakapee1p, &gvar.video.palette, &gvar);
 	//VL_LoadPalFile("data/default.pal", &gvar.video.palette);
 
 #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);
@@ -142,7 +138,7 @@ void main(int argc, char *argv[])
 #ifdef FADE
 		modexFadeOff(4, &gvar.video.palette);
 #endif
-		Quit (&gvar, "Wrong ID for sprite");
+		Quit ("Wrong ID for sprite");
 #ifdef FADE
 		modexFadeOn(4, &gvar.video.dpal);
 #endif
@@ -151,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
@@ -215,14 +212,14 @@ void main(int argc, char *argv[])
 			}
 			//read_vrs(&gvar, bakapee1, gvar.player[0].enti.spri->spritesheet);
 			VRS_ReadVRS(bakapee1, &gvar.player[0].enti, &gvar);
-			VL_LoadPalFile(bakapee1p, &gvar.video.palette);
+			VL_LoadPalFile(bakapee1p, &gvar.video.palette, &gvar);
 		}//JK
 #ifdef FADE
 		if(gvar.in.inst->Keyboard[10]){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }
 #endif
 		if(gvar.in.inst->Keyboard[sc_R]){ modexPalOverscan(rand()%56); } //r
 
-		if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit (&gvar, "PLAYER OFF THE RAILS!");//break;	//incase things go out of sync!
+		if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit ("PLAYER OFF THE RAILS!");//break;	//incase things go out of sync!
 	}
 
 	/* fade back to text mode */