X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fzcroll.c;h=a28522d71f4ded0c85f7d199ef5412fd13af310c;hb=d1ad125567c999bff1adeff2e0f5b1ada15ebd2d;hp=10f87f6683df713bc9ea5052df767d8dfa53c356;hpb=2e3fb239b58cf341ceb5b4e7b39b6542f5581cae;p=16.git

diff --git a/src/zcroll.c b/src/zcroll.c
index 10f87f66..a28522d7 100755
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -20,20 +20,19 @@
  *
  */
 
-#include "src/lib/zcroll16.h"
+#include "src/lib/16_scr.h"
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/wcpu.h"
 #include "src/lib/16render.h"
 #include "src/lib/16_dbg.h"
 
 #define MODEXZ
-boolean dbg_noplayerinpu=1;
 
 //TODO: known issues the array dependent mv stuff and player arrays
 global_game_variables_t gvar;
 static map_t map;
-player_t *player;
-map_view_t *mv;
+player_t player[MaxPlayers];
+map_view_t mv[4];
 float t;
 sword bakapee;
 pan_t pan;
@@ -63,11 +62,10 @@ void main(int argc, char *argv[])
 
 	pan.pn=0;
 	// OK, this one takes hellova time and needs to be done in farmalloc or MM_...
-	//TODO: USE MM AND CA AND PM WWWWWWWW
-	player = malloc(sizeof(player_t));
-	player->ent = malloc(sizeof(entity_t));
-	player->ent->spri = malloc(sizeof(struct sprite));
-	player->ent->spri->spritesheet = malloc(sizeof(struct vrs_container));
+	//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].ent->spri = malloc(sizeof(struct sprite));
+	player[0].ent->spri->spritesheet = malloc(sizeof(struct vrs_container));
 
 	// create the map
 	fprintf(stderr, "testing map load~	");
@@ -77,14 +75,10 @@ void main(int argc, char *argv[])
 	fprintf(stderr, "yay map loaded~~\n");
 
 	// data
-	printf("loading sprite\n");
-	read_vrs(&gvar, "data/spri/chikyuu.vrs", player->ent->spri->spritesheet); printf("sprite loaded\n");
+	read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].ent->spri->spritesheet);
 
 	//	input!
-if(!dbg_noplayerinpu)
-{
-	IN_Default(0, player,ctrl_Joystick); printf("IN_defaulted\n");
-}
+	IN_Default(0, &player,ctrl_Keyboard1);
 
 	// save the palette
 #ifdef FADE
@@ -94,13 +88,14 @@ if(!dbg_noplayerinpu)
 #endif
 	textInit();
 	VGAmodeX(bakapee, 1, &gvar);
+	//strcpy(global_temp_status_text, "press enter for video setup\nescape to quit");
+	//modexprint(&gvar.video.page[0], 64, 64, 1, 7, 0, global_temp_status_text);
+	//while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww
 #ifdef MODEXZ
 #ifdef FADE
 	modexPalBlack();	//reset the palette~
-		printf("VGA\n");
 	CA_LoadFile("data/spri/chikyuu.pal", &pal, &gvar);
 	modexPalUpdate1(pal);
-		printf("pallette\n");
 	gpal = modexNewPal();
 	modexPalSave(gpal);
 	modexSavePalFile("data/g.pal", gpal);
@@ -108,33 +103,38 @@ if(!dbg_noplayerinpu)
 #endif
 
 	// setup camera and screen~
-if(dbg_noplayerinpu)
-{
-	//sprintf(&gvar.pee, "press a key for video setup");
-	strcpy(global_temp_status_text, "press a key for video setup");
-	modexprint(mv->page, 0, 64, 1, 7, 0, global_temp_status_text);
-	getch();
-}
+	strcpy(global_temp_status_text, "press enter for page setup\nescape to quit");
+	modexprint(&gvar.video.page[0], 64, 64, 1, 7, 0, global_temp_status_text);
+	while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww
 	modexHiganbanaPageSetup(&gvar.video);
-	mv->page = &gvar.video.page[0];
-	mv->map = ↦
-	mv->video = &gvar.video;
-	mv->pan	= &pan;
-	player->ent->spri->x = player->ent->spri->y = 20;
+	for(i=0;i<gvar.video.num_of_pages;i++)
+	{
+		mv[i].page = &gvar.video.page[i];
+		mv[i].map = &map;
+		mv[i].video = &gvar.video;
+		mv[i].pan	= &pan;
+	}
+	player[0].ent->spri->x = player[0].ent->spri->y = 20;
 
+	strcpy(global_temp_status_text, "press enter for mapGoTo setup\nescape to quit");
+	modexprint(mv[0].page/*&gvar.video.page[0]*/, 64, 64, 1, 7, 0, global_temp_status_text);
+	while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww
 	// 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);
+	strcpy(global_temp_status_text, "press enter for final initiation setup\nescape to quit");
+	modexprint(&gvar.video.page[0], 64, 64, 1, 7, 0, global_temp_status_text);
+	while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1); //wwww
 #endif
 
 	//TODO: put player in starting position of spot
 	//default player position on the viewable map
-	player->tx = mv->tx + mv->page->tilemidposscreenx;
-	player->ty = mv->ty + mv->page->tilemidposscreeny;
-	IN_initplayer(player);	printf("player inited\n");
+	player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;
+	player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;
+	IN_initplayer(&player, 0);
 
-	i = set_anim_by_id(player->ent->spri, 11);
-	print_anim_ids(player->ent->spri);
+	i = set_anim_by_id(player[0].ent->spri, 11);
+	print_anim_ids(player[0].ent->spri);
 	if (i == -1)
 	{
 #ifdef FADE
@@ -148,31 +148,29 @@ if(dbg_noplayerinpu)
 #endif
 	exit(-4);
 	}
-	//animate_spri(&(player->ent->spri));
-	printf("spri ok\n");
+	//animate_spri(&(player[0].ent->spri));
 
-	modexShowPage(mv->page);//!(gvar.video.p)
+	modexShowPage(mv[0].page);//!(gvar.video.p)
 	shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible.
 #ifdef FADE
 	modexFadeOn(4, gpal);
 #endif
-	printf("LOOP\n");
-	if(!dbg_noplayerinpu)
-	while(!IN_KeyDown(sc_Escape) && player->hp>0)
+	while(!IN_KeyDown(sc_Escape))// && player[0].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->tx or player->ty == 0 or player->tx == 20 or player->ty == 15 then stop because that is edge of map and you do not want to walk of the map
+		//when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map
 
 		//player movement
-		IN_ReadControl(player);
+		IN_ReadControl(0, &player);
 		if(!panswitch){
-			walk(player->ent, mv);
+			ZC_walk(player[0].ent, mv);
+			//walk(mv, &player, 0);
 		}
 
 		//the scripting stuff....
-/*		if(((mv->map->data[(player->triggerx-1)+(map.width*(player->triggery-1))] == 0) && IN_KeyDown(0x1C))||(player->tx == 5 && player->ty == 5))
+/*		if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
 		{
 			short i;
 			for(i=800; i>=400; i--)
@@ -181,14 +179,14 @@ if(dbg_noplayerinpu)
 			}
 			nosound();
 		}
-		if(player->q == (TILEWH/(player->speed))+1 && player->info.dir != 2 && (player->triggerx == 5 && player->triggery == 5)){ player->hp--; }
+		if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }
 */		//debugging binds!
-		if(IN_KeyDown(2)){ modexShowPage(mv->page); pan.pn=0; }
-		if(IN_KeyDown(25)){ modexpdump(mv->page);
+		if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; }
+		if(IN_KeyDown(25)){ modexpdump(mv[0].page);
 			 IN_UserInput(1,1);
 		}	//p
 #ifdef FADE
-		if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv->page); IN_UserInput(1,1); }
+		if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); IN_UserInput(1,1); }
 		if(IN_KeyDown(22)){
 			printf("2paloffset	=	%d\n", paloffset/3);
 			IN_UserInput(1,1);
@@ -209,12 +207,12 @@ if(dbg_noplayerinpu)
 		}
 		if(IN_KeyDown(67))	//f9
 		{
-			modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 2);
+			modexClearRegion(mv[0].page, 0, 0, mv[0].page->width, mv[0].page->height, 2);
 		}
 		if(IN_KeyDown(66))	//f8
 		{
-	//		modexDrawSprite(mv->page, 16, 16, p);
-			modexDrawSprite(mv->page, 32+48, 16, (player->data));
+	//		modexDrawSprite(mv[0].page, 16, 16, p);
+			modexDrawSprite(mv[0].page, 32+48, 16, (player[0].data));
 		}
 		//TODO fmemtest into page
 		/*if(IN_KeyDown(4+1))	//4
@@ -229,18 +227,13 @@ if(dbg_noplayerinpu)
 		if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }
 		//if(IN_KeyDown(11)){ modexPalOverscan(15); }
 #endif
-		if((player->q==1) && !(player->x%TILEWH==0 && player->y%TILEWH==0)) break;	//incase things go out of sync!
-		player->hp = 0;
+		if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;	//incase things go out of sync!
+		player[0].hp = 0;
 	}
 
-	else
-		while(!kbhit())
-		{
-			shinku(&gvar);
-		}
-
 	/* fade back to text mode */
 	/* but 1st lets save the game palette~ */
+	quit:
 #ifdef FADE
 	modexPalSave(gpal);
 	modexSavePalFile("data/g.pal", gpal);
@@ -250,33 +243,7 @@ if(dbg_noplayerinpu)
 	Shutdown16(&gvar);
 	printf("\nProject 16 zcroll.exe. This is just a test file!\n");
 	printf("version %s\n", VERSION);
-	printf("tx: %d	", mv->tx);
-	printf("ty: %d\n", mv->ty);
-	printf("\n");
-	printf("player vars:\n");
-	printf("	x: %d", player->x); printf("	y: %d\n", player->y);
-	//if(player->hp==0) printf("%d wwww\n", player->y+8);
-	//else printf("\nplayer->y: %d\n", player->y);
-	printf("	tx: %d", player->tx); printf("	ty: %d\n", player->ty);
-	printf("	triggx: %d", player->triggerx); printf("	triggy: %d\n", player->triggery);
-	printf("	hp: %d", (player->hp));	printf("	q: %d", player->q);	printf("	player.info.dir: %d", player->info.dir);	printf("	player.d: %d ", player->d);
-		printf("	pdir=%d\n", player->pdir);
-	printf("	tile data value at player trigger position: %d\n\n", mv->map->data[(player->triggerx-1)+(map.width*(player->triggery-1))]);
-	printf("Virtual Screen: %dx", gvar.video.page[0].width);	printf("%d	", gvar.video.page[0].height);
-	printf("Screen: %dx", gvar.video.page[0].sw);	printf("%d\n", gvar.video.page[0].sh);
-	printf("virtual tile resolution: %dx", gvar.video.page[0].tilesw);	printf("%d	", gvar.video.page[0].tilesh);
-	printf("tile resolution: %dx", gvar.video.page[0].tw);	printf("%d\n", gvar.video.page[0].th);
-	printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);	printf("%d\n", gvar.video.page[0].tilemidposscreeny);
-	modexprintmeminfo(&gvar.video);
-	//printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("	mv[%u].ty: %d	", pan.pn, mv[pan.pn].ty);
-	printf("gvar.video.p=%u ", gvar.video.p); printf("gvar.video.r=%u ", gvar.video.r);
-	printf("pageflipflop=%u\n", pageflipflop);
-	//0000printf("\ngvar.video.tickclk=%f\n", gvar.video.tickclk);
-	//0000printf("gvar.video.clk=%f", gvar.video.clk);
-	printf("\n");
-	//printf("map.width=%d	map.height=%d	map.data[0]=%d\n", mv->map->width, mv->map->height, mv->map->data[0]);
-
-	printf("\n");
+	SCROLLEXITMESG;
 	switch(detectcpu())
 	{
 		case 0: cpus = "8086/8088 or 186/88"; break;