X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=8f8c27f514c90a91fbd582785df3eaef5fcbc2e0;hb=6b164d70a5927e8955b1e0869c4ad32d63410d00;hp=d262a24ee6f909d05e8d609c40bd2627d737573d;hpb=10ea364bfa2876441b440871b226afb51be0665b;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index d262a24e..8f8c27f5 100755
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -33,14 +33,16 @@ global_game_variables_t gvar;
 static map_t map;
 player_t player[MaxPlayers];
 //page_t screen, gvar.video.page[1], gvar.video.page[2];
-map_view_t mv[3];
+map_view_t mv[4];
 bitmap_t p;
-word pn=0;
+//word pn=0; //i forgot ww
 static planar_buf_t huge *pp;
 float t;
 sword bakapee;
 pan_t pan;
-boolean panswitch=1;
+//debugswitches
+boolean panswitch=0;
+boolean pageflipflop=1;
 	unsigned int i;
 	const char *cpus;
 	//static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
@@ -83,7 +85,15 @@ void main(int argc, char *argv[])
 		return;
 	}
 
-	pan.pn=0;
+	if (_DEBUG_INIT() == 0) {
+#ifdef DEBUGSERIAL
+		printf("WARNING: Failed to initialize DEBUG output\n");
+#endif
+	}
+	_DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log
+	_DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);
+
+	pan.pn=1;
 	//player[0].data = &pp;
 
 	printf("starting timer	");
@@ -118,7 +128,7 @@ void main(int argc, char *argv[])
 	/*	input!	*/
 	IN_Startup();
 	IN_Default(0,&player,ctrl_Joystick);
-	IN_Default(1,&player,ctrl_Joystick);
+	//IN_Default(1,&player,ctrl_Joystick);
 
 	/* save the palette */
 #ifdef MODEX
@@ -160,62 +170,61 @@ void main(int argc, char *argv[])
 
 	/* setup camera and screen~ */
 	modexHiganbanaPageSetup(&gvar.video);
-	for(i=0;i<gvar.video.num_of_pages-3;i++)
+	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;
-		/* set up paging */
-//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
-		mapGoTo(&mv[i], 0, 0);
-//TODO: put player in starting position of spot
 	}
+	/* 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);
+	modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[1].page->width, mv[1].page->height);
 
-	//modexClearRegion(mv[0].page, 0, 0, mv[0].page->width+TILEWH, mv[0].page->height+TILEWH, 15);
-
+	//TODO: put player in starting position of spot
 	//default player position on the viewable map
-	player[panswitch].tx = mv[0].tx + mv[0].page->tilemidposscreenx;
-	player[panswitch].ty = mv[0].ty + mv[0].page->tilemidposscreeny;
+	player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;
+	player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;
 	IN_initplayer(&player, 0);
-	IN_initplayer(&player, 1);
+	//IN_initplayer(&player, 1);
 
-//	modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
 #ifndef	SPRITE
-//	modexClearRegion(mv[1].page, player[panswitch].x-4, player[panswitch].y-TILEWH, 24, 32, 15);
+	modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
 #else
-	//PBUFSFUN(mv[1].page, player[panswitch].x-4, player[panswitch].y-TILEWH, 24, 64, 24, 32,	PLAYERBMPDATA);
-//	PBUFSFUN(mv[1].page, player[panswitch].x-4, player[panswitch].y-TILEWH, 24, 64, 24, 32,	&pp);
+	//PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,	PLAYERBMPDATA);
+	PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,	&pp);
 #endif
 
-	modexShowPage(mv[pan.pn].page);
-	shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible.
+	if(!pageflipflop)	modexShowPage(mv[1].page);
+	else			modexShowPage(mv[(gvar.video.p)].page);
+		shinku_fps_indicator_page = 1; // we're on page 1 now, shinku(). follow along please or it will not be visible.
 	//modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
 #ifdef MODEX
 #ifdef FADE
 	modexFadeOn(4, gpal);
 #endif
 #endif
-	while(!IN_KeyDown(sc_Escape) && player[panswitch].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[panswitch].tx or player[panswitch].ty == 0 or player[panswitch].tx == 20 or player[panswitch].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(panswitch,&player);
+		IN_ReadControl(0,&player);
 	if(!panswitch){
-		walk(mv, player, panswitch);
+		walk(mv, player, 0);
 	}else{
-		panpagemanual(mv, player, panswitch);
-		//printf("	player[panswitch].q: %d", player[panswitch].q);	printf("	player[panswitch].d: %d\n", player[panswitch].d);
+		panpagemanual(mv, player, 0);
+		//printf("	player[0].q: %d", player[0].q);	printf("	player[0].d: %d\n", player[0].d);
 	}
 
 
 	//the scripting stuff....
-	//if(((player[panswitch].triggerx == TRIGGX && player[panswitch].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[panswitch].tx == 5 && player[panswitch].ty == 5))
-	if(((mv[panswitch].map->data[(player[panswitch].triggerx-1)+(map.width*(player[panswitch].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[panswitch].tx == 5 && player[panswitch].ty == 5))
+	//if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].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--)
@@ -224,13 +233,12 @@ void main(int argc, char *argv[])
 		}
 		nosound();
 	}
-	if(player[panswitch].q == (TILEWH/(player[panswitch].speed))+1 && player[panswitch].info.dir != 2 && (player[panswitch].triggerx == 5 && player[panswitch].triggery == 5)){ player[panswitch].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(0x0E)) while(1){ if(xmsmalloc(24)) break; }
 	if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; }
 	if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; }
-	//if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; }
-	//if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; }
+	if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; }
+	if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; }
 	if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);
 		//IN_Ack();
 	}	//p
@@ -238,7 +246,7 @@ void main(int argc, char *argv[])
 #ifdef FADE
 	if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); }
 	if(IN_KeyDown(22)){
-	paloffset=0; modexPalBlack(); modexPalUpdate(&player[panswitch].data, &paloffset, 0, 0);
+	paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
 	printf("1paloffset	=	%d\n", paloffset/3);
 	 modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
 	printf("2paloffset	=	%d\n", paloffset/3);
@@ -276,7 +284,7 @@ void main(int argc, char *argv[])
 	//9
 	if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); }
 	//if(IN_KeyDown(11)){ modexPalOverscan(default_pal, 15); }
-	if((player[panswitch].q==1) && !(player[panswitch].x%TILEWH==0 && player[panswitch].y%TILEWH==0)) break;	//incase things go out of sync!
+	if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;	//incase things go out of sync!
 	}
 
 	/* fade back to text mode */
@@ -294,14 +302,14 @@ void main(int argc, char *argv[])
 	printf("version %s\n", VERSION);
 	printf("tx: %d\n", mv[0].tx);
 	printf("ty: %d\n", mv[0].ty);
-	printf("player.x: %d", player[panswitch].x); printf("		player.y: %d\n", player[panswitch].y);
+	printf("player.x: %d", player[0].x); printf("		player.y: %d\n", player[0].y);
 	//if(player[0].hp==0) printf("%d wwww\n", player[0].y+8);
 	//else printf("\nplayer[0].y: %d\n", player[0].y);
-	printf("player.tx: %d", player[panswitch].tx); printf("		player.ty: %d\n", player[panswitch].ty);
-	printf("player.triggx: %d", player[panswitch].triggerx); printf("	player.triggy: %d\n", player[panswitch].triggery);
-	printf("player.hp: %d", (player[panswitch].hp));	printf("	player.q: %d", player[panswitch].q);	printf("	player.info.dir: %d", player[panswitch].info.dir);	printf("	player.d: %d ", player[panswitch].d);
-		printf("pdir=%d\n", player[panswitch].pdir);
-	printf("tile data value at player trigger position: %d\n", mv[0].map->data[(player[panswitch].triggerx-1)+(map.width*(player[panswitch].triggery-1))]);
+	printf("player.tx: %d", player[0].tx); printf("		player.ty: %d\n", player[0].ty);
+	printf("player.triggx: %d", player[0].triggerx); printf("	player.triggy: %d\n", player[0].triggery);
+	printf("player.hp: %d", (player[0].hp));	printf("	player.q: %d", player[0].q);	printf("	player.info.dir: %d", player[0].info.dir);	printf("	player.d: %d ", player[0].d);
+		printf("pdir=%d\n", player[0].pdir);
+	printf("tile data value at player trigger position: %d\n", mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);
 //	printf("palette offset:	%d\n", paloffset/3);
 //++++	printf("Total used: %zu\n", oldfreemem-GetFreeSize());
 //++++	printf("Total free: %zu\n", GetFreeSize());
@@ -312,21 +320,10 @@ void main(int argc, char *argv[])
 	printf("virtual tile resolution: %dx", gvar.video.page[0].tilesw);	printf("%d\n", 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);
-	printf("video memory remaining: %ld\n", gvar.video.vmem_remain);
-	printf("page ");
-	for(i=0; i<gvar.video.num_of_pages;i++)
-	{
-		printf("	[%u]=", i);
-		printf("(%Fp)\n", (gvar.video.page[i].data));
-	}
-	printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("	mv[%u].ty: %d\n", pan.pn, mv[pan.pn].ty);
+	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\n", gvar.video.p);
 	//printf("player[1].q: %d", player[1].q);	printf("	player[1].d: %d\n", player[1].d);
 	printf("\n");
-//	printf("Screen2: %dx", gvar.video.page[1].width);	printf("%d\n", gvar.video.page[1].height);
-//	printf("map: %dx%d\n", map.width, map.height);
-//	printf("\n");
-//	printf("player[0].info.x: %d", player[0].info.xaxis); printf("		player[0].info.y: %d\n", player[0].info.yaxis);
-//	printf("player[0].info.tx: %d", player[0].info.x); printf("		player[0].info.ty: %d\n", player[0].info.y);
 	//printf("map.width=%d	map.height=%d	map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);
 
 	printf("\n");