X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fscroll.c;h=688b91c80586b31b584dcb2371dd4b1e1a9171c1;hb=208a9f3194d5039b308f3a4f1a1bcdee7beb244d;hp=6357ad9bf45c3f61634485495df38b6f3036bc17;hpb=c21427f2bf5be1066b2a38fafd8b82cdbd178eae;p=16.git

diff --git a/src/scroll.c b/src/scroll.c
index 6357ad9b..688b91c8 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;
+//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 */
@@ -160,7 +162,7 @@ void main(int argc, char *argv[])
 
 	/* setup camera and screen~ */
 	modexHiganbanaPageSetup(&gvar.video);
-	for(i=0;i<gvar.video.num_of_pages-2;i++)
+	for(i=0;i<gvar.video.num_of_pages;i++)
 	{
 		mv[i].page = &gvar.video.page[i];
 		mv[i].map = &map;
@@ -169,9 +171,8 @@ void main(int argc, char *argv[])
 	}
 	/* 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, 0);
-	mapGoTo(&mv[1], 0, 0);
-	//modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[1].page->width, mv[1].page->height);
+	mapGoTo(mv, 0, 0);
+	modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[1].page->width, mv[1].page->height);
 
 	//TODO: put player in starting position of spot
 	//default player position on the viewable map
@@ -187,8 +188,9 @@ void main(int argc, char *argv[])
 	PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,	&pp);
 #endif
 
-	modexShowPage(mv[1].page);
-	shinku_fps_indicator_page = 1; // 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
@@ -207,7 +209,7 @@ void main(int argc, char *argv[])
 	if(!panswitch){
 		walk(mv, player, 0);
 	}else{
-		panpagemanual(mv, player, pan.pn);
+		panpagemanual(mv, player, 0);
 		//printf("	player[0].q: %d", player[0].q);	printf("	player[0].d: %d\n", player[0].d);
 	}
 
@@ -225,11 +227,10 @@ void main(int argc, char *argv[])
 	}
 	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
@@ -311,21 +312,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	", pan.pn, mv[pan.pn].ty); printf("panswitch=%u\n", panswitch);
+	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");