X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fzcroll.c;h=888a00341c67bed7dffab102e30475518044f91a;hb=af2715fef8681d909afe82f7baaf5e13baabb76f;hp=b5c51d1764f6d7f840bca30ba55a2f24f37ae7c6;hpb=d182bbe56ee5292986d3ae5ea273b9ff4142fd7e;p=16.git

diff --git a/src/zcroll.c b/src/zcroll.c
index b5c51d17..888a0034 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -27,8 +27,8 @@
 
 #define FADE
 
+//map_view_t mv[4];
 static map_t map;
-map_view_t mv[4];
 float t;
 
 //debugswitches
@@ -45,8 +45,8 @@ memptr pal;
 
 #define FILENAME_1	"data/spri/chikyuu.vrs"
 #define FILENAME_1P	"data/spri/chikyuu.pal"
-#define FILENAME_2	"data/spri/ptmp.vrs"
-#define FILENAME_2P	"data/spri/ptmp.pal"
+#define FILENAME_2	"data/spri/me.vrs"
+#define FILENAME_2P	"data/spri/me.pal"
 
 void main(int argc, char *argv[])
 {
@@ -73,8 +73,7 @@ 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
-	//gvar.player[0].enti.spri = malloc(sizeof(struct sprite));
-	gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));
+	//----gvar.player[0].enti.spri.spritesheet = malloc(sizeof(struct vrs_container));
 
 	// create the map
 //	fprintf(stderr, "testing map load~	");
@@ -88,7 +87,7 @@ void main(int argc, char *argv[])
 	VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);
 
 	// input!
-	IN_Default(0, &gvar.player,ctrl_Keyboard1);
+	IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar);
 
 	// save the palette
 #ifdef FADE
@@ -118,14 +117,14 @@ void main(int argc, char *argv[])
 
 	// setup camera and screen~
 	modexHiganbanaPageSetup(&gvar.video);
-	ZC_MVSetup(&mv, &map, &gvar);
+	ZC_MVSetup(&gvar.mv, &map, &gvar);
 
 	// set up paging
 	//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
-	mapGoTo(&mv, 0, 0);
+	mapGoTo(&gvar.mv, 0, 0);
 
-	ZC_PlayerXYpos(0, 0, &gvar.player, &mv, 0, 1);
-	EN_initPlayer(&gvar.player, 0, &gvar.video);
+	ZC_PlayerXYpos(0, 0, &gvar.player, &gvar.mv, 0, 1);
+	EN_initPlayer(&gvar.player[0], &gvar.video);
 	//print_anim_ids(gvar.player[0].enti.spri);
 	if (gvar.video.sprifilei == -1)
 	{
@@ -139,27 +138,27 @@ void main(int argc, char *argv[])
 	}
 
 //	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;
+	gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
+	gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;
 	shinku(&gvar);
-//modexpdump(mv[0].page);
+//modexpdump(gvar.mv[0].page);
 #ifdef FADE
 	modexFadeOn(4, &gvar.video.palette);
 #endif
 	while(!IN_KeyDown(sc_Escape) && gvar.player[0].enti.hp>0)
 	{
-		gvar.video.page[0].tlx=mv[0].tx*TILEWH;
-		gvar.video.page[0].tly=mv[0].ty*TILEWH;
+		gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
+		gvar.video.page[0].tly=gvar.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 gvar.player position data move to the edge of the screen with respect to the direction
 		//when gvar.player[0].tx or gvar.player[0].ty == 0 or gvar.player[0].tx == 20 or gvar.player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map
 
 		//gvar.player movement
-		IN_ReadControl(0, &gvar.player);
+		IN_ReadControl(&gvar.player[0], &gvar);
 		if(!panswitch){
 			//ZC_walk2(gvar.player[0].ent, mv);
-			ZC_walk(&mv, &gvar.player, 0);
+			ZC_walk(&gvar.mv, &gvar.player, 0);
 		}else{
 			TAIL_PANKEYFUNZC;
 			//printf("	gvar.player[0].enti.q: %d", gvar.player[0].enti.q);	printf("	gvar.player[0].d: %d\n", gvar.player[0].d);
@@ -167,7 +166,7 @@ void main(int argc, char *argv[])
 
 		//the scripting stuff....
 		//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))
+		if(((gvar.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--)
@@ -179,7 +178,7 @@ void main(int argc, char *argv[])
 		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!
 
-		if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(mv[0].page); IN_UserInput(1,1); } //o
+		if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o
 		if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u
 
 		TAIL_FUNCTIONKEYFUNCTIONS
@@ -204,7 +203,7 @@ void main(int argc, char *argv[])
 			VL_LoadPalFile(bakapee1p, &gvar.video.palette);
 		}//JK
 #ifdef FADE
-		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1,1); }
+		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }
 #endif
 		if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r