X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.c;h=4ad596f0969b2bb1408a48589f3e3c07ffdcee72;hb=62e514036d73a377dcbc7c8fb1e35807a972179a;hp=21c3d7415369ef0aa20727b6d4db0a2adb714423;hpb=4a866133883d9d7edd43f7101062a5f775bda4da;p=16.git

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 21c3d741..4ad596f0 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -36,7 +36,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 		break;
 		//right movement
 		case 3:
-			if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tw < pip[0].map->width && player[pn].enti.tx == pip[0].tx+pip[0].page->tilemidposscreenx &&
+			if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->ti.tw < pip[0].map->width && player[pn].enti.tx == pip[0].tx+pip[0].page->ti.tilemidposscreenx &&
 			!(pip[0].map->data[(player[pn].enti.tx)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx+1 == TRIGGX && player[pn].enti.ty == TRIGGY))	//collision detection!
 			{
 				player[pn].walktype=2;
@@ -73,7 +73,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 		break;
 		//left movement
 		case 1:
-			if(pip[0].tx > 0 && pip[0].tx+pip[0].page->tw <= pip[0].map->width && player[pn].enti.tx == pip[0].tx+pip[0].page->tilemidposscreenx &&
+			if(pip[0].tx > 0 && pip[0].tx+pip[0].page->ti.tw <= pip[0].map->width && player[pn].enti.tx == pip[0].tx+pip[0].page->ti.tilemidposscreenx &&
 			!(pip[0].map->data[(player[pn].enti.tx-2)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx-1 == TRIGGX && player[pn].enti.ty == TRIGGY))	//collision detection!
 			{
 				player[pn].walktype=2;
@@ -110,7 +110,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 		break;
 		//down movement
 		case 4:
-			if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->th < pip[0].map->height && player[pn].enti.ty == pip[0].ty+pip[0].page->tilemidposscreeny &&
+			if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->ti.th < pip[0].map->height && player[pn].enti.ty == pip[0].ty+pip[0].page->ti.tilemidposscreeny &&
 			!(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty))] == 0))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty+1 == TRIGGY))	//collision detection!
 			{
 				player[pn].walktype=2;
@@ -147,7 +147,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 		break;
 		//up movement
 		case 0:
-			if(pip[0].ty > 0 && pip[0].ty+pip[0].page->th <= pip[0].map->height && player[pn].enti.ty == pip[0].ty+pip[0].page->tilemidposscreeny &&
+			if(pip[0].ty > 0 && pip[0].ty+pip[0].page->ti.th <= pip[0].map->height && player[pn].enti.ty == pip[0].ty+pip[0].page->ti.tilemidposscreeny &&
 			!(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty-2))] == 0))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty-1 == TRIGGY))	//collision detection!
 			{
 				player[pn].walktype=2;
@@ -194,7 +194,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
 	{
 		//right movement
 		case 3:
-			if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tw < pip[0].page->tilesw)
+			if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->ti.tw < pip[0].page->ti.tilesw)
 			{
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
@@ -207,7 +207,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
 
 		//left movement
 		case 1:
-			if(pip[0].tx > 0 && pip[0].tx+pip[0].page->tw <= pip[0].page->tilesw)
+			if(pip[0].tx > 0 && pip[0].tx+pip[0].page->ti.tw <= pip[0].page->ti.tilesw)
 			{
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
@@ -220,7 +220,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
 
 		//down movement
 		case 4:
-			if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->th < pip[0].page->tilesh)
+			if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->ti.th < pip[0].page->ti.tilesh)
 			{
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
@@ -233,7 +233,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
 
 		//up movement
 		case 0:
-			if(pip[0].ty > 0 && pip[0].ty+pip[0].page->th <= pip[0].page->tilesh)
+			if(pip[0].ty > 0 && pip[0].ty+pip[0].page->ti.th <= pip[0].page->ti.tilesh)
 			{
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
@@ -257,7 +257,8 @@ void ZC_MVSetup(map_view_t *pip, map_t *map, global_game_variables_t *gv)
 	pip[0].page = &gv->video.page[0];
 	pip[0].map = map;
 	pip[0].video = &gv->video;
-	pip[0].panp	= &gv->video.panp;
+	pip[0].p	= &gv->video.p;
+	pip[0].sp	= &gv->video.sp;
 	ZC_MVInit(pip, 1, 1);
 
 	for(i=ZC_MVI;i<gv->video.num_of_pages;i++)
@@ -265,7 +266,8 @@ void ZC_MVSetup(map_view_t *pip, map_t *map, global_game_variables_t *gv)
 		pip[i].page	=	&gv->video.page[i];
 		pip[i].map	=	pip[0].map;
 		pip[i].video	=	pip[0].video;
-		pip[i].panp	=	pip[0].panp;
+		pip[i].p	=	pip[0].p;
+		pip[i].sp	=	pip[0].sp;
 //		if(i>ZC_MVI) {
 		pip[i].tx =	1;
 		pip[i].ty =	1;
@@ -287,7 +289,7 @@ void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr)
 	byte crtcOffset;
 
 	/* calculate offset */
-	offset = (word) moo[moo[0].video->panp].page->data;
+	offset = (word) moo[moo[0].video->sp].page->data;
 	offset += moo[0].page->dy * (moo[0].page->width >> 2 );
 	offset += moo[0].page->dx >> 2;
 
@@ -295,7 +297,7 @@ void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr)
 	switch(sr)
 	{
 		case 1:
-			crtcOffset = moo[0].page->sw >> 3;
+			crtcOffset = moo[moo[0].video->sp].page->sw >> 3;
 		break;
 		default:
 		case 0:
@@ -434,10 +436,10 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 	if(player[plid].enti.q==4)
 #endif
 		if(id==0)
-			mapDrawCol(&mv[0], mv[0].tx + mv[0].page->tw, mv[0].ty-1, x, player, DRAWCOLNUM);
-		else
-			if(!pageflipflop && !pageploop)
-				modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->th+2));
+			mapDrawCol(&mv[0], mv[0].tx + mv[0].page->ti.tw, mv[0].ty-1, x, player, DRAWCOLNUM);
+// 		else
+// 			if(!pageflipflop && !pageploop)
+// 				modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->ti.th+2));
 	mv[0].video->r=1;
 }
 
@@ -469,9 +471,9 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
 #endif
 		if(id==0)
 			mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, DRAWCOLNUM);
-		else
-			if(!pageflipflop && !pageploop)
-				modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->th+2));
+// 		else
+// 			if(!pageflipflop && !pageploop)
+// 				modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->ti.th+2));
 	mv[0].video->r=1;
 }
 
@@ -503,9 +505,9 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
 #endif
 		if(id==0)
 			mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, DRAWCOLNUM);
-		else
-			if(!pageflipflop && !pageploop)
-				modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tw+2), mv[id].map->tiles->tileHeight);
+// 		else
+// 			if(!pageflipflop && !pageploop)
+// 				modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->ti.tw+2), mv[id].map->tiles->tileHeight);
 	mv[0].video->r=1;
 }
 
@@ -536,10 +538,10 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 	if(player[plid].enti.q==4)
 #endif
 		if(id==0)
-			mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->th, y, player, DRAWCOLNUM);
-		else
-			if(!pageflipflop && !pageploop)
-				modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tw+2), mv[id].map->tiles->tileHeight);
+			mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player, DRAWCOLNUM);
+// 		else
+// 			if(!pageflipflop && !pageploop)
+// 				modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->ti.tw+2), mv[id].map->tiles->tileHeight);
 	mv[0].video->r=1;
 }
 
@@ -618,8 +620,8 @@ void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 //default player position on the viewable map
 void playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn)
 {
-	player[pn].enti.tx = x + pip[0].tx + pip[0].page->tilemidposscreenx;
-	player[pn].enti.ty = y + pip[0].ty + pip[0].page->tilemidposscreeny;
+	player[pn].enti.tx = x + pip[0].tx + pip[0].page->ti.tilemidposscreenx;
+	player[pn].enti.ty = y + pip[0].ty + pip[0].page->ti.tilemidposscreeny;
 }
 //===========================================================================
 
@@ -688,18 +690,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
 		mapDrawWRow(&mv[0], tx-1, ty, py);
 	i+=mv->map->width - tx;
 	}
-	if(!pageploop)
-		modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
-// 	{
-// 		unsigned int k,j,o;
-// 		/* fill screen with a distinctive pattern */
-// 		for (k=0;k < vga_state.vga_width;k++) {
-// 			o = k >> 2;
-// 			vga_write_sequencer(0x02/*map mask*/,1 << (k&3));
-// 				for (j=0;j < (mv[0].page->height)+(mv[1].page->height)+(mv[2].page->height)+(mv[3].page->height);j++,o += vga_state.vga_stride)
-// 					vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15!
-// 		}
-// 	}
+// 	if(!pageploop) modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
 	modexCopyPageRegion(mv[3].page, mv[0].page, 0/**/, 0/**/, 0, 0, 24, 32);
 }
 
@@ -835,8 +826,8 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
 	//setkb(0);
 }*/
 
-boolean pageflipflop = 1;
-boolean pageploop = 1;
+//boolean pageflipflop = 1;
+//boolean pageploop = 1;
 boolean pagenorendermap = 0;
 boolean pagedelayrendermap = 0;
 
@@ -894,17 +885,17 @@ void shinku(global_game_variables_t *gv)
 		break;
 	}
 	//render!!
-	if(pageflipflop){
+//	if(pageflipflop){
 	if(gv->video.r ){//r=1
 		//vga_setup_wm1_block_copy();
 		//_fmemcpy((gv->video.page[(gv->video.p)]).data, (gv->video.page[(!gv->video.p)]).data, gv->video.page[(!gv->video.p)].pagesize);
 		//vga_restore_rm0wm0();
-		if(!pageploop) modexCopyPageRegion(&(gv->video.page[(gv->video.p)]), &(gv->video.page[(!gv->video.p)]), 0, 0, 0, 0, gv->video.page[gv->video.p].width, gv->video.page[!gv->video.p].height);
-		VL_ShowPage(&(gv->video.page[gv->video.panp]), gv->kurokku.fpscap, 0);//VL_ShowPage(&(gv->video.page[gv->video.p]), gv->kurokku.fpscap, 0);
-		if(!pageploop) gv->video.p=!gv->video.p;
+// 		if(!pageploop) modexCopyPageRegion(&(gv->video.page[(gv->video.p)]), &(gv->video.page[(!gv->video.p)]), 0, 0, 0, 0, gv->video.page[gv->video.p].width, gv->video.page[!gv->video.p].height);
+		VL_ShowPage(&(gv->video.page[gv->video.sp]), gv->kurokku.fpscap, 0);
+// 		if(!pageploop) gv->video.p=!gv->video.p;
 		gv->video.r =!gv->video.r ;
 		//0000gv->video.tickclk = ((*clockw)-gv->video.startclk)/18.2;
-	}
+//	}
 	}
 }
 
@@ -987,14 +978,13 @@ void animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitc
 		break;
 	}
 
-	if(!pageflipflop)
-		modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 36);
-	else{
-		//copy old bg to page0
-		//modexCopyPageRegion(pip[3].page, pip[0].page, bx, by,	0, 0,	20, 36);
-		//update buffer
-		//modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0,	x, y,	20, 36);
-	}
+// 	if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 36);
+// 	else{
+// 		//copy old bg to page0
+// 		//modexCopyPageRegion(pip[3].page, pip[0].page, bx, by,	0, 0,	20, 36);
+// 		//update buffer
+// 		//modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0,	x, y,	20, 36);
+// 	}
 //modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height);
 	//modexCopyPageRegion(pip[3].page, pip[!(pip->video->p)].page, x-4, y-4, 0, 128, 28, 36);
 	/*modexCopyPageRegion(pip[pip->video->p].page,
@@ -1139,7 +1129,7 @@ boolean ZC_walk2(entity_t *enti, map_view_t *map_v)
 
 void player_walk(player_t *player, map_view_t *map_v){
 	int dx=16, dy=16;
-	if(ZC_walk2(&(player->enti), map_v) && boundary_check(map_v->tx, map_v->ty, dx, dy, map_v->map->width - 2*map_v->page->tilesw, map_v->map->height - 2*map_v->page->tilesh))
+	if(ZC_walk2(&(player->enti), map_v) && boundary_check(map_v->tx, map_v->ty, dx, dy, map_v->map->width - 2*map_v->page->ti.tilesw, map_v->map->height - 2*map_v->page->ti.tilesh))
 	{
 		mapScroll(map_v, player);
 		// (Un)load stuff?