X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=36a7370c2fa96bfcc23fe33cac557dcda0f90455;hb=af3fef6d5d490fded0b36ad2f7e983fe732af986;hp=df818d6970d4285f84913816ca17f91188c9bee8;hpb=3a7f7812852634ac758ef5593ccc5730eefc44a6;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index df818d69..36a7370c 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -34,13 +34,12 @@ sword bakapee;
 //debugswitches
 boolean panswitch=0;//1
 //extern boolean pageflipflop=1;
-boolean pagenorendermap = 1;
+extern boolean pagenorendermap;
 unsigned int i;
 //#ifdef FADE
 	static word paloffset=0;
-	byte *dpal;
+	byte *gvar.video.dpal;
 //#endif
-	byte *gpal;
 //	byte *ptr;
 	byte *mappalptr;
 
@@ -55,7 +54,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);
 //	printf("chkmap ok	");
 //	fprintf(stderr, "yay map loaded~~\n");
@@ -75,9 +74,9 @@ void main(int argc, char *argv[])
 	/* save the palette */
 #ifdef MODEX
 #ifdef FADE
-	dpal = modexNewPal();
-	modexPalSave(dpal);
-	modexFadeOff(4, dpal);
+	gvar.video.dpal = modexNewPal();
+	modexPalSave(gvar.video.dpal);
+	modexFadeOff(4, gvar.video.dpal);
 #endif
 
 	VGAmodeX(bakapee, 1, &gvar);
@@ -88,9 +87,9 @@ void main(int argc, char *argv[])
 #endif
 #endif
 //++++	PCXBMPVAR.offset=(paloffset/3);
-//++++	modexPalUpdate1(&PCXBMPVAR, &paloffset, 0, 0);
-	modexPalUpdate1(&PCXBMP->palette);
-//++++0000		modexPalUpdate1(map.tiles->btdata->palette);
+//++++	modexPalUpdate(&PCXBMPVAR, &paloffset, 0, 0);
+	modexPalUpdate(&PCXBMP->palette);
+//++++0000		modexPalUpdate(map.tiles->btdata->palette);
 	//printf("	%d\n", sizeof(ptmp->data));
 	//printf("1:	%d\n", paloffset);
 //++++	map.tiles->data->offset=(paloffset/3);
@@ -100,9 +99,9 @@ void main(int argc, char *argv[])
 //	printf("====\n\n");
 #ifdef MODEX
 #ifdef FADE
-	gpal = modexNewPal();
-	modexPalSave(gpal);
-	modexSavePalFile("data/g.pal", gpal);
+	&gvar.video.palette = modexNewPal();
+	modexPalSave(&gvar.video.palette);
+	modexSavePalFile("data/g.pal", &gvar.video.palette);
 	modexPalBlack();	//so player will not see loadings~
 #endif
 #endif
@@ -118,10 +117,18 @@ 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;
+	if (gvar.video.sprifilei == -1)
+	{
+#ifdef FADE
+		modexFadeOff(4, &gvar.video.palette);
+#endif
+		Quit(&gvar, "Wrong");
+#ifdef FADE
+		modexFadeOn(4, gvar.video.dpal);
+#endif
+	}
 
 #ifndef	SPRITE
 	modexClearRegion(mv[0].page, player[0].enti.x, player[0].enti.y-TILEWH, 16, 32, 15);
@@ -151,7 +158,7 @@ void main(int argc, char *argv[])
 
 #ifdef MODEX
 #ifdef FADE
-	modexFadeOn(4, gpal);
+	modexFadeOn(4, &gvar.video.palette);
 #endif
 #endif
 	while(!IN_KeyDown(sc_Escape) && player[0].enti.hp>0)
@@ -172,7 +179,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--)
@@ -185,7 +192,7 @@ void main(int argc, char *argv[])
 	//debugging binds!
 #ifdef MODEX
 #ifdef FADE
-	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p
+	if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); } //p
 	/*if(IN_KeyDown(22)){
 	paloffset=0; modexPalBlack(); modexPalUpdate(PCXBMPVAR, &paloffset, 0, 0);
 	printf("1paloffset	=	%d\n", paloffset/3);
@@ -212,7 +219,7 @@ void main(int argc, char *argv[])
 
 	//9
 #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
 
@@ -223,9 +230,9 @@ void main(int argc, char *argv[])
 	/* but 1st lets save the game palette~ */
 #ifdef MODEX
 #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
 	VGAmodeX(0, 1, &gvar);
 #endif
@@ -236,7 +243,7 @@ void main(int argc, char *argv[])
 	WCPU_cpufpumesg();
 #ifdef MODEX
 #ifdef FADE
-	modexFadeOn(4, dpal);
+	modexFadeOn(4, gvar.video.dpal);
 #endif
 #endif
 }