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

diff --git a/src/xcroll.c b/src/xcroll.c
index 888a0034..189746da 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -22,10 +22,10 @@
 
 #include "src/lib/scroll16.h"
 #include "src/lib/16_timer.h"
-#include "src/lib/16render.h"
 #include "src/lib/16_dbg.h"
 
 #define FADE
+//#define NOMAPLOAD
 
 //map_view_t mv[4];
 static map_t map;
@@ -51,24 +51,17 @@ memptr pal;
 void main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	char *bakapee1,*bakapee1p;
-//	sword bakapee;
-// 	if(argv[1]) bakapee = atoi(argv[1]);
-// 	else bakapee = 1;
+	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) {
-		//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 (argc >= 2) {
+		if(argv[1]){ strcpy(bakapee1, argv[1]);
+		if(argv[2]) strcpy(bakapee1p, argv[2]); }
 	}
 
 	// OK, this one takes hellova time and needs to be done in farmalloc or MM_...
@@ -78,11 +71,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);
 
@@ -96,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);
@@ -106,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);
@@ -131,21 +138,22 @@ 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
 	}
 
-//	while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }
+//	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
 	modexFadeOn(4, &gvar.video.palette);
 #endif
-	while(!IN_KeyDown(sc_Escape) && gvar.player[0].enti.hp>0)
+	while(!gvar.in.inst->Keyboard[sc_Escape] && gvar.player[0].enti.hp>0)
 	{
 		gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
 		gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;
@@ -165,8 +173,8 @@ void main(int argc, char *argv[])
 		}
 
 		//the scripting stuff....
-		//if(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
-		if(((gvar.mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
+		//if(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && gvar.in.inst->Keyboard[0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
+		if(((gvar.mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && gvar.in.inst->Keyboard[0x1C])||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))
 		{
 			short i;
 			for(i=800; i>=400; i--)
@@ -178,36 +186,40 @@ void main(int argc, char *argv[])
 		if(gvar.player[0].enti.q == (TILEWH/(gvar.player[0].enti.speed))+1 && gvar.player[0].info.dir != 2 && (gvar.player[0].enti.triggerx == 5 && gvar.player[0].enti.triggery == 5)){ gvar.player[0].enti.hp--; }
 		//debugging binds!
 
-		if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o
-		if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u
+		if(gvar.in.inst->Keyboard[24]){ VL_modexPalScramble(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o
+		if(gvar.in.inst->Keyboard[22]){ VL_modexPalScramble(&gvar.video.palette); } //u
 
 		TAIL_FUNCTIONKEYFUNCTIONS
 		TAIL_FUNCTIONKEYDRAWJUNK
-		if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }
-		if(IN_KeyDown(sc_J) || IN_KeyDown(sc_K))
+		if(gvar.in.inst->Keyboard[sc_L]){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }
+		if(gvar.in.inst->Keyboard[sc_J] || gvar.in.inst->Keyboard[sc_K])
 		{
-			if(IN_KeyDown(sc_J))
+			if(gvar.in.inst->Keyboard[sc_J])
 			{
-				bakapee1=FILENAME_1;
-				bakapee1p=FILENAME_1P;
+//				bakapee1=FILENAME_1;
+//				bakapee1p=FILENAME_1P;
+				strcpy(bakapee1, FILENAME_1);
+				strcpy(bakapee1p, FILENAME_1P);
 				gvar.player[0].enti.overdraww=0;
 			}
-			if(IN_KeyDown(sc_K))
+			if(gvar.in.inst->Keyboard[sc_K])
 			{
-				bakapee1=FILENAME_2;
-				bakapee1p=FILENAME_2P;
+//				bakapee1=FILENAME_2;
+//				bakapee1p=FILENAME_2P;
+				strcpy(bakapee1, FILENAME_2);
+				strcpy(bakapee1p, FILENAME_2P);
 				gvar.player[0].enti.overdraww=2;
 			}
 			//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(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }
+		if(gvar.in.inst->Keyboard[10]){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }
 #endif
-		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r
+		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 */
@@ -218,7 +230,7 @@ void main(int argc, char *argv[])
 	modexFadeOff(4, &gvar.video.palette);
 #endif
 	Shutdown16(&gvar);
-	printf("\nProject 16 zcroll.exe. This is just a test file!\n");
+	printf("\nProject 16 xcroll.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
 	SCROLLEXITMESG;
 	WCPU_cpufpumesg();