X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fzcroll.c;h=ed2341bb37e629d758bcafe5ab8e1227c3009c97;hb=3bccccc5b1bd97dc63e3caccc800959e9e5948db;hp=557cc9a3e16e9c0e97e1c706d134eb8cad00d9b1;hpb=fa252ebd82649e4f3bab4a53228828766713ad6c;p=16.git

diff --git a/src/zcroll.c b/src/zcroll.c
index 557cc9a3..ed2341bb 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -34,7 +34,7 @@ float t;
 //debugswitches
 boolean panswitch=0,baka=0;
 //extern boolean pageflipflop=1;
-boolean pagenorendermap = 0;	//default: 0
+extern boolean pagenorendermap;	//default: 0
 unsigned int i;
 
 #ifdef FADE
@@ -82,7 +82,7 @@ void main(int argc, char *argv[])
 
 	// create the map
 //	fprintf(stderr, "testing map load~	");
-	loadmap("data/test.map", &map);
+	CA_loadmap("data/test.map", &map, &gvar);
 	chkmap(&map, 0);
 //	initMap(&map);
 //	printf("chkmap ok	");
@@ -103,15 +103,16 @@ void main(int argc, char *argv[])
 
 	VGAmodeX(1/*bakapee*/, 1, &gvar);
 
-	/* fix up the palette and everything */
-#ifdef FADE
-	modexPalBlack();	//reset the palette~
-#endif
-
 	/* load color palette */
+	/*ptmp.offset=(paloffset/3);
+	modexPalUpdate(&ptmp, &paloffset, 0, 0);
+	//modexClearRegion(bg->page, 0, 0, 320, 240, 255);
+	//printf("	%d\n", sizeof(ptmp.data));
+	//printf("1:	%d\n", paloffset);
+	map.tiles->data->offset=(paloffset/3);
+	modexPalUpdate(map.tiles->data, &paloffset, 0, 0);*/
 	VL_LoadPalFile(bakapee1p, &gvar.video.palette);
-// 	CA_LoadFile("data/spri/"BAKAPEEFILE1".pal", &pal, &gvar);
-// 	modexPalUpdate1(pal);
+
 #ifdef FADE
 	gpal = modexNewPal();
 	modexPalSave(gpal);
@@ -127,33 +128,31 @@ void main(int argc, char *argv[])
 	//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
 	mapGoTo(&mv, 0, 0);
 
-	ZC_playerXYpos(0, 0, &player, &mv, 0);
+	ZC_playerXYpos(0, 0, &player, &mv, 0, 1);
 	EN_initplayer(&player, 0, &gvar.video);
-	player[0].enti.spri->x = player[0].enti.x-4;
-	player[0].enti.spri->y = player[0].enti.y-16;
-
-	player[0].enti.dire=31;
-	gvar.video.sprifilei = set_anim_by_id(player[0].enti.spri, player[0].enti.dire);
 	//print_anim_ids(player[0].enti.spri);
 	if (gvar.video.sprifilei == -1)
 	{
 #ifdef FADE
 		modexFadeOff(4, gpal);
 #endif
-		Quit(&gvar, "Wrong");
+		Quit(&gvar, "Wrong ID for sprite");
 #ifdef FADE
 		modexFadeOn(4, dpal);
 #endif
 	}
 
 //	while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }
-	VL_ShowPage(mv[0].page, 0, 0);
-	animate_spri(&(player[0].enti), &gvar.video);
+	gvar.video.page[0].tlx=mv[0].tx*TILEWH;
+	gvar.video.page[0].tly=mv[0].ty*TILEWH;
+	shinku(&gvar);
 #ifdef FADE
 	modexFadeOn(4, gpal);
 #endif
 	while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)
 	{
+		gvar.video.page[0].tlx=mv[0].tx*TILEWH;
+		gvar.video.page[0].tly=mv[0].ty*TILEWH;
 		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 player position data move to the edge of the screen with respect to the direction
@@ -186,22 +185,6 @@ void main(int argc, char *argv[])
 		if(IN_KeyDown(24)){ modexPalUpdate0(gpal); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o
 		if(IN_KeyDown(22)){ modexPalUpdate0(gpal); } //u
 
-		//pan switch
-		if(IN_KeyDown(66))	//f8
-		{
-//			modexDrawSprite(mv[0].page, 16, 16, &p);
-//			modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));
-			switch(i)
-			{
-				case 11:
-					i=0;
-					player[0].enti.spri->x = TILEWH;
-				default:
-					i++;
-					animate_spri(&(player[0].enti), &gvar.video);// player[0].enti.spri->x += 16;
-				break;
-			}
-		}
 		FUNCTIONKEYFUNCTIONS
 		FUNCTIONKEYDRAWJUNK
 		if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y, 16, 16, 1); }
@@ -211,22 +194,24 @@ void main(int argc, char *argv[])
 			{
 				bakapee1=FILENAME_1;
 				bakapee1p=FILENAME_1P;
+				player[0].enti.overdraww=0;
 			}
 			if(IN_KeyDown(sc_K))
 			{
 				bakapee1=FILENAME_2;
 				bakapee1p=FILENAME_2P;
+				player[0].enti.overdraww=2;
 			}
 			//read_vrs(&gvar, bakapee1, player[0].enti.spri->spritesheet);
 			VRS_ReadVRS(bakapee1, &player[0].enti, &gvar);
 			VL_LoadPalFile(bakapee1p, &gvar.video.palette);
 		}//JK
 #ifdef FADE
-		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }
+		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(dpal); IN_UserInput(1,1); }
 #endif
 		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r
 
-		if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) break;	//incase things go out of sync!
+		if((player[0].enti.q==1) && !(player[0].enti.x%TILEWH==0 && player[0].enti.y%TILEWH==0)) Quit(&gvar, "PLAYER OFF THE RAILS!");//break;	//incase things go out of sync!
 	}
 
 	/* fade back to text mode */
@@ -236,7 +221,6 @@ void main(int argc, char *argv[])
 	modexSavePalFile("data/g.pal", gpal);
 	modexFadeOff(4, gpal);
 #endif
-	VGAmodeX(0, 1, &gvar);
 	Shutdown16(&gvar);
 	printf("\nProject 16 zcroll.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);