X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=7fb6f755e137606516e5225ee90f603850faab67;hb=bb9d5bf711b1b19b8f4b3d2592e3569858c70a43;hp=6e7664f00125e87a0132b026f56ab2a9ec9ef9b7;hpb=02ebe5d276d33d55b9d46fef19a8ef939b7c9743;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 6e7664f0..7fb6f755 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -38,16 +38,14 @@ 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;
 
 void main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	static player_t player[MaxPlayers];
 	if(argv[1]) bakapee = atoi(argv[1]);
 	else bakapee = 1;
 
@@ -55,7 +53,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");
@@ -70,14 +68,14 @@ void main(int argc, char *argv[])
 
 #endif
 	/*	input!	*/
-	IN_Default(0, &player,ctrl_Keyboard1);
+	IN_Default(0, &gvar.gvar.player,ctrl_Keyboard1);
 
 	/* 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);
@@ -100,10 +98,10 @@ void main(int argc, char *argv[])
 //	printf("====\n\n");
 #ifdef MODEX
 #ifdef FADE
-	gpal = modexNewPal();
-	modexPalSave(gpal);
-	modexSavePalFile("data/g.pal", gpal);
-	modexPalBlack();	//so player will not see loadings~
+	&gvar.video.palette = modexNewPal();
+	modexPalSave(&gvar.video.palette);
+	modexSavePalFile("data/g.pal", &gvar.video.palette);
+	modexPalBlack();	//so gvar.player will not see loadings~
 #endif
 #endif
 
@@ -118,23 +116,23 @@ 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, 1);
-	EN_initplayer(&player, 0, &gvar.video);
+	ZC_gvar.playerXYpos(0, 0, &gvar.player, &mv, 0, 1);
+	EN_initgvar.player(&gvar.player, 0, &gvar.video);
 	if (gvar.video.sprifilei == -1)
 	{
 #ifdef FADE
-		modexFadeOff(4, gpal);
+		modexFadeOff(4, &gvar.video.palette);
 #endif
 		Quit(&gvar, "Wrong");
 #ifdef FADE
-		modexFadeOn(4, dpal);
+		modexFadeOn(4, gvar.video.dpal);
 #endif
 	}
 
 #ifndef	SPRITE
-	modexClearRegion(mv[0].page, player[0].enti.x, player[0].enti.y-TILEWH, 16, 32, 15);
+	modexClearRegion(mv[0].page, gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 32, 15);
 #else
-	modexDrawSpriteRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y-TILEWH, 16, 64, 16, 32,	PCXBMPPTR);
+	modexDrawSpriteRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y-TILEWH, 16, 64, 16, 32,	PCXBMPPTR);
 #endif
 
 	//if(!pageflipflop)
@@ -159,28 +157,28 @@ 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)
+	while(!IN_KeyDown(sc_Escape) && gvar.player[0].enti.hp>0)
 	{
 		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
-	//when player[0].enti.tx or player[0].enti.ty == 0 or player[0].enti.tx == 20 or player[0].enti.ty == 15 then stop because that is edge of map and you do not want to walk of the map
+	//to stop scrolling and have the gvar.player position data move to the edge of the screen with respect to the direction
+	//when gvar.player[0].enti.tx or gvar.player[0].enti.ty == 0 or gvar.player[0].enti.tx == 20 or gvar.player[0].enti.ty == 15 then stop because that is edge of map and you do not want to walk of the map
 
-	//player movement
-		IN_ReadControl(0, &player);
+	//gvar.player movement
+		IN_ReadControl(0, &gvar.player);
 	if(!panswitch){
-		ZC_walk(&mv, &player, 0);
+		ZC_walk(&mv, &gvar.player, 0);
 	}else{
-		PANKEYFUNZC;//panPageManual(&mv, &player, 0);
-		//printf("	player[0].enti.q: %d", player[0].enti.q);	printf("	player[0].d: %d\n", player[0].d);
+		PANKEYFUNZC;//panPageManual(&mv, &gvar.player, 0);
+		//printf("	gvar.player[0].enti.q: %d", gvar.player[0].enti.q);	printf("	gvar.player[0].d: %d\n", gvar.player[0].d);
 	}
 
 	//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(((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(((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))
 	{
 		short i;
 		for(i=800; i>=400; i--)
@@ -189,11 +187,11 @@ void main(int argc, char *argv[])
 		}
 		nosound();
 	}
-	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--; }
+	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!
 #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);
@@ -216,24 +214,24 @@ void main(int argc, char *argv[])
 
 	FUNCTIONKEYFUNCTIONS
 	FUNCTIONKEYDRAWJUNK
-	if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], player[0].enti.x, player[0].enti.y, 16, 16, 1); }
+	if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }
 
 	//9
 #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
 
-	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((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) break;	//incase things go out of sync!
 	}
 
 	/* fade back to text mode */
 	/* 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
@@ -244,7 +242,7 @@ void main(int argc, char *argv[])
 	WCPU_cpufpumesg();
 #ifdef MODEX
 #ifdef FADE
-	modexFadeOn(4, dpal);
+	modexFadeOn(4, gvar.video.dpal);
 #endif
 #endif
 }