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

diff --git a/src/xcroll.c b/src/xcroll.c
index 2fd95869..7b97a9af 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -108,7 +108,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);
@@ -118,7 +119,7 @@ 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
@@ -161,7 +162,6 @@ void main(int argc, char *argv[])
 	{
 		gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
 		gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;
-		modexWaitBorder();
 		shinku(&gvar);
 		//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
 		//to stop scrolling and have the gvar.player position data move to the edge of the screen with respect to the direction
@@ -217,7 +217,7 @@ 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); }