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

diff --git a/src/zcroll.c b/src/zcroll.c
index 342f3ba5..af771fb7 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -39,9 +39,7 @@ unsigned int i;
 
 #ifdef FADE
 //static word paloffset=0;
-byte *dpal;
 #endif
-byte *gpal;
 byte *ptr;
 memptr pal;
 
@@ -76,9 +74,8 @@ 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~	");
@@ -96,9 +93,9 @@ 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);
@@ -115,9 +112,8 @@ void main(int argc, char *argv[])
 	//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
 
@@ -135,11 +131,11 @@ 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
 	}
 
@@ -149,7 +145,7 @@ void main(int argc, char *argv[])
 	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)
 	{
@@ -172,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->MAPDATAPTR[(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--)
@@ -209,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); modexPalUpdate(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
 
@@ -219,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");
@@ -229,6 +225,6 @@ void main(int argc, char *argv[])
 	SCROLLEXITMESG;
 	WCPU_cpufpumesg();
 #ifdef FADE
-	modexFadeOn(4, dpal);
+	modexFadeOn(4, gvar.video.dpal);
 #endif
 }