X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fzcroll.c;h=af771fb75bb0d0d37481db62e7855af04d215160;hb=aedfbc6bc6b542aaa113f55c625b9d782d58a2cd;hp=9b6ba75f2f8c2072360d0e2e59552d0a698e27ad;hpb=ffbad4972c8eed182edd7c0ba1fef0bc1d457bf2;p=16.git

diff --git a/src/zcroll.c b/src/zcroll.c
index 9b6ba75f..af771fb7 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -34,14 +34,12 @@ 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
 //static word paloffset=0;
-byte *dpal;
 #endif
-byte *gpal;
 byte *ptr;
 memptr pal;
 
@@ -76,13 +74,12 @@ void main(int argc, char *argv[])
 
 	// OK, this one takes hellova time and needs to be done in farmalloc or MM_...
 	//IN CA i think you use CAL_SetupGrFile but i do think we should work together on this part --sparky4
-	//player[0].ent = malloc(sizeof(entity_t));
-	player[0].enti.spri = malloc(sizeof(struct sprite));
-	player[0].enti.spri->spritesheet = malloc(sizeof(struct vrs_container));
+	//player[0].enti.spri = malloc(sizeof(struct sprite));
+	player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));
 
 	// 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	");
@@ -96,26 +93,27 @@ void main(int argc, char *argv[])
 
 	// save the palette
 #ifdef FADE
-	dpal = modexNewPal();
-	modexPalSave(dpal);
-	modexFadeOff(4, dpal);
+	modexPalSave(&gvar.video.dpal);
+	modexFadeOff(4, &gvar.video.dpal);
+	modexPalBlack();
 #endif
 
 	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);
+	//VL_LoadPalFile("data/default.pal", &gvar.video.palette);
+
 #ifdef FADE
-	gpal = modexNewPal();
-	modexPalSave(gpal);
-	modexSavePalFile("data/g.pal", gpal);
+	modexPalSave(&gvar.video.palette);
+	modexSavePalFile("data/g.pal", &gvar.video.palette);
 	modexPalBlack();	//so player will not see loadings~
 #endif
 
@@ -133,21 +131,26 @@ void main(int argc, char *argv[])
 	if (gvar.video.sprifilei == -1)
 	{
 #ifdef FADE
-		modexFadeOff(4, gpal);
+		modexFadeOff(4, &gvar.video.palette);
 #endif
 		Quit(&gvar, "Wrong ID for sprite");
 #ifdef FADE
-		modexFadeOn(4, dpal);
+		modexFadeOn(4, &gvar.video.dpal);
 #endif
 	}
 
 //	while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }
+	gvar.video.page[0].tlx=mv[0].tx*TILEWH;
+	gvar.video.page[0].tly=mv[0].ty*TILEWH;
 	shinku(&gvar);
+//modexpdump(mv[0].page);
 #ifdef FADE
-	modexFadeOn(4, gpal);
+	modexFadeOn(4, &gvar.video.palette);
 #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
@@ -165,7 +168,7 @@ void main(int argc, char *argv[])
 
 		//the scripting stuff....
 		//if(((player[0].enti.triggerx == TRIGGX && player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))
-		if(((mv[0].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))
+		if(((mv[0].map->layerdata[0].data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].enti.tx == 5 && player[0].enti.ty == 5))
 		{
 			short i;
 			for(i=800; i>=400; i--)
@@ -177,8 +180,8 @@ void main(int argc, char *argv[])
 		if(player[0].enti.q == (TILEWH/(player[0].enti.speed))+1 && player[0].info.dir != 2 && (player[0].enti.triggerx == 5 && player[0].enti.triggery == 5)){ player[0].enti.hp--; }
 		//debugging binds!
 
-		if(IN_KeyDown(24)){ modexPalUpdate0(gpal); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o
-		if(IN_KeyDown(22)){ modexPalUpdate0(gpal); } //u
+		if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o
+		if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u
 
 		FUNCTIONKEYFUNCTIONS
 		FUNCTIONKEYDRAWJUNK
@@ -202,7 +205,7 @@ void main(int argc, char *argv[])
 			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(gvar.video.dpal); IN_UserInput(1,1); }
 #endif
 		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r
 
@@ -212,9 +215,9 @@ void main(int argc, char *argv[])
 	/* fade back to text mode */
 	/* but 1st lets save the game palette~ */
 #ifdef FADE
-	modexPalSave(gpal);
-	modexSavePalFile("data/g.pal", gpal);
-	modexFadeOff(4, gpal);
+	modexPalSave(&gvar.video.palette);
+	modexSavePalFile("data/g.pal", &gvar.video.palette);
+	modexFadeOff(4, &gvar.video.palette);
 #endif
 	Shutdown16(&gvar);
 	printf("\nProject 16 zcroll.exe. This is just a test file!\n");
@@ -222,6 +225,6 @@ void main(int argc, char *argv[])
 	SCROLLEXITMESG;
 	WCPU_cpufpumesg();
 #ifdef FADE
-	modexFadeOn(4, dpal);
+	modexFadeOn(4, gvar.video.dpal);
 #endif
 }