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

diff --git a/src/xcroll.c b/src/xcroll.c
index 0f4bf060..7b97a9af 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -26,6 +26,7 @@
 #include "src/lib/16_dbg.h"
 
 #define FADE
+//#define NOMAPLOAD
 
 //map_view_t mv[4];
 static map_t map;
@@ -85,11 +86,15 @@ void main(int argc, char *argv[])
 	// create the map
 //	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
+	chkmap(&map, 1);
+	//initMap(&map);
+#endif
 	// data
 	VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);
 
@@ -103,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);
@@ -113,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
@@ -211,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); }