X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.c;h=eca613a8ccfbc1bdf60f5a4a0b837813c3dc3953;hb=e012c52a8f42fcce241d66d77a34d001eb5c1c64;hp=c56efd9171b93fa294fd9a42a5d30720ed1af65e;hpb=3874a9cb6927a17c012c93c7bf306241253f8812;p=16.git diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index c56efd91..eca613a8 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -44,9 +44,9 @@ void walk(map_view_t *pip, player_t *player, word pn) { INC_PER_FRAME; animatePlayer(pip, player, pn, 1); - if(!pageploop){ ScrollRight(pip, player, 3, pn); + ScrollRight(pip, player, 3, pn); ScrollRight(pip, player, 2, pn); - mapScrollRight(pip, player, !(pip[0].video->p), pn); } + mapScrollRight(pip, player, !(pip[0].video->p), pn); mapScrollRight(pip, player, (pip[0].video->p), pn); if(!pageflipflop) modexShowPage(pip[1].page); player[pn].q++; @@ -66,11 +66,11 @@ void walk(map_view_t *pip, player_t *player, word pn) } else { - if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 16, 32); + if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32); #ifdef SPRITE - PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 16, 32, 16, 32, PLAYERBMPDATA); + PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATA); #else - modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 16, 32, 14); + modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 14); #endif if(!pageflipflop) modexShowPage(pip[1].page); player[pn].d = 2; @@ -88,9 +88,9 @@ void walk(map_view_t *pip, player_t *player, word pn) { INC_PER_FRAME; animatePlayer(pip, player, pn, 1); - if(!pageploop){ ScrollLeft(pip, player, 3, pn); + ScrollLeft(pip, player, 3, pn); ScrollLeft(pip, player, 2, pn); - mapScrollLeft(pip, player, !(pip[0].video->p), pn); } + mapScrollLeft(pip, player, !(pip[0].video->p), pn); mapScrollLeft(pip, player, (pip[0].video->p), pn); if(!pageflipflop) modexShowPage(pip[1].page); player[pn].q++; @@ -110,11 +110,11 @@ void walk(map_view_t *pip, player_t *player, word pn) } else { - if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 16, 32); + if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32); #ifdef SPRITE - PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 16, 96, 16, 32, PLAYERBMPDATA); + PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATA); #else - modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 16, 32, 10); + modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 10); #endif if(!pageflipflop) modexShowPage(pip[1].page); player[pn].d = 2; @@ -132,9 +132,9 @@ void walk(map_view_t *pip, player_t *player, word pn) { INC_PER_FRAME; animatePlayer(pip, player, pn, 1); - if(!pageploop){ ScrollDown(pip, player, 3, pn); + ScrollDown(pip, player, 3, pn); ScrollDown(pip, player, 2, pn); - mapScrollDown(pip, player, !(pip[0].video->p), pn); } + mapScrollDown(pip, player, !(pip[0].video->p), pn); mapScrollDown(pip, player, (pip[0].video->p), pn); if(!pageflipflop) modexShowPage(pip[1].page); player[pn].q++; @@ -154,11 +154,11 @@ void walk(map_view_t *pip, player_t *player, word pn) } else { - if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 16, 32); + if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32); #ifdef SPRITE - PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 16, 64, 16, 32, PLAYERBMPDATA); + PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATA); #else - modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 16, 32, 9); + modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 9); #endif if(!pageflipflop) modexShowPage(pip[1].page); player[pn].d = 2; @@ -176,9 +176,9 @@ void walk(map_view_t *pip, player_t *player, word pn) { INC_PER_FRAME; animatePlayer(pip, player, pn, 1); - if(!pageploop){ ScrollUp(pip, player, 3, pn); + ScrollUp(pip, player, 3, pn); ScrollUp(pip, player, 2, pn); - mapScrollUp(pip, player, !(pip[0].video->p), pn); } + mapScrollUp(pip, player, !(pip[0].video->p), pn); mapScrollUp(pip, player, (pip[0].video->p), pn); if(!pageflipflop) modexShowPage(pip[1].page); player[pn].q++; @@ -198,11 +198,11 @@ void walk(map_view_t *pip, player_t *player, word pn) } else { - if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 16, 32); + if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32); #ifdef SPRITE - PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 16, 0, 16, 32, PLAYERBMPDATA); + PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATA); #else - modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 16, 32, 12); + modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 12); #endif if(!pageflipflop) modexShowPage(pip[1].page); player[pn].d = 2; @@ -374,6 +374,7 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid) mv[id].tx++; /* Snap the origin forward */ mv[id].page->data += 4; + mv[id].page->dx = mv[id].map->tiles->tileWidth; } @@ -383,7 +384,7 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid) if(id==0) mapDrawCol(&mv[0], mv[0].tx + mv[0].page->tw, mv[0].ty-1, x, player, mv->page->dx); else - if(!pageflipflop) + 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)); mv[0].video->r=1; } @@ -403,6 +404,7 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid) mv[id].tx--; /* Snap the origin backward */ mv[id].page->data -= 4; + mv[id].page->dx = mv[id].map->tiles->tileWidth; } @@ -412,7 +414,7 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid) if(id==0) mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, mv->page->dx); else - if(!pageflipflop) + 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)); mv[0].video->r=1; } @@ -431,7 +433,8 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid) /* go down one tile */ mv[id].ty--; /* Snap the origin downward */ - mv[id].page->data -= mv[id].page->width*4; + mv[id].page->data -= mv[id].page->pi; + mv[id].page->dy = mv[id].map->tiles->tileHeight; } @@ -441,7 +444,7 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid) if(id==0) mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, mv->page->dy); else - if(!pageflipflop) + 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); mv[0].video->r=1; } @@ -459,7 +462,8 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid) /* go down one tile */ mv[id].ty++; /* Snap the origin downward */ - mv[id].page->data += mv[id].page->width*4; + mv[id].page->data += mv[id].page->pi; + mv[id].page->dy = mv[id].map->tiles->tileHeight; } @@ -469,7 +473,7 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid) if(id==0) mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->th, y, player, mv->page->dy); else - if(!pageflipflop) + 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); mv[0].video->r=1; } @@ -479,104 +483,68 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid) void near ScrollRight(map_view_t *mv, player_t *player, word id, word plid) { /* increment the pixel position and update the page */ - mv[0].video->page[id].dx += player[plid].speed; + mv[id].page->dx += player[plid].speed; /* check to see if this changes the tile */ - if(mv[0].video->page[id].dx >= mv[0].dxThresh ) + if(mv[id].page->dx >= mv[0].dxThresh ) { - /* block copy pattern to where we will draw the sprite */ - vga_setup_wm1_block_copy(); -// { -// word i; -// byte o,o2; -// o2 = *mv[0].video->page[id].data+4; -// o = *mv[0].video->page[id].data; -// for (i=0;i < mv[0].video->page[id].height;i++,o += mv[0].video->page[id].width+vga_state.vga_stride,o2 += (*mv[0].video->page[id].data >> 2)) vga_wm1_mem_block_copy(o2,o,*mv[0].video->page[id].data >> 2); -// } - _fmemmove(mv[0].video->page[id].data+4, mv[0].video->page[id].data, mv[0].video->page[id].pagesize); - /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */ - vga_restore_rm0wm0(); +// vga_setup_wm1_block_copy(); +// _fmemmove(mv[id].page->data+4, mv[id].page->data, mv[id].page->pagesize); +// vga_restore_rm0wm0(); /* Snap the origin forward */ - mv[0].video->page[id].data += 4; - mv[0].video->page[id].dx = mv[0].map->tiles->tileWidth; + mv[id].page->data += 4; + mv[id].page->dx = mv[0].map->tiles->tileWidth; } } void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid) { /* decrement the pixel position and update the page */ - mv[0].video->page[id].dx -= player[plid].speed; + mv[id].page->dx -= player[plid].speed; /* check to see if this changes the tile */ - if(mv[0].video->page[id].dx == 0) + if(mv[id].page->dx == 0) { - /* block copy pattern to where we will draw the sprite */ - vga_setup_wm1_block_copy(); -// { -// word i; -// byte o,o2; -// o2 = *mv[0].video->page[id].data-4; -// o = *mv[0].video->page[id].data; -// for (i=0;i < mv[0].video->page[id].height;i++,o += mv[0].video->page[id].width+vga_state.vga_stride,o2 += (*mv[0].video->page[id].data >> 2)) vga_wm1_mem_block_copy(o2,o,*mv[0].video->page[id].data >> 2); -// } - _fmemmove(mv[0].video->page[id].data-4, mv[0].video->page[id].data, mv[0].video->page[id].pagesize); - /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */ - vga_restore_rm0wm0(); +// vga_setup_wm1_block_copy(); +// _fmemmove(mv[id].page->data-4, mv[id].page->data, mv[id].page->pagesize); +// vga_restore_rm0wm0(); /* Snap the origin backward */ - mv[0].video->page[id].data -= 4; - mv[0].video->page[id].dx = mv[0].map->tiles->tileWidth; + mv[id].page->data -= 4; + mv[id].page->dx = mv[0].map->tiles->tileWidth; } } void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid) { /* decrement the pixel position and update the page */ - mv[0].video->page[id].dy -= player[plid].speed; + mv[id].page->dy -= player[plid].speed; /* check to see if this changes the tile */ - if(mv[0].video->page[id].dy == 0) + if(mv[id].page->dy == 0) { - /* block copy pattern to where we will draw the sprite */ - vga_setup_wm1_block_copy(); -// { -// word i; -// byte o,o2; -// o2 = *mv[0].video->page[id].data-mv[0].video->page[id].pi; -// o = *mv[0].video->page[id].data; -// for (i=0;i < mv[0].video->page[id].height;i++,o += mv[0].video->page[id].width+vga_state.vga_stride,o2 += (*mv[0].video->page[id].data >> 2)) vga_wm1_mem_block_copy(o2,o,*mv[0].video->page[id].data >> 2); -// } - _fmemmove(mv[0].video->page[id].data-mv[0].video->page[id].pi, mv[0].video->page[id].data, mv[0].video->page[id].pagesize); - /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */ - vga_restore_rm0wm0(); +// vga_setup_wm1_block_copy(); +// _fmemmove(mv[id].page->data-mv[id].page->pi, mv[id].page->data, mv[id].page->pagesize); +// vga_restore_rm0wm0(); /* Snap the origin backward */ - mv[0].video->page[id].data -= mv[0].video->page[id].pi; - mv[0].video->page[id].dy = mv[0].map->tiles->tileWidth; + mv[id].page->data -= mv[id].page->pi; + mv[id].page->dy = mv[0].map->tiles->tileWidth; } } void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid) { /* increment the pixel position and update the page */ - mv[0].video->page[id].dy += player[plid].speed; + mv[id].page->dy += player[plid].speed; /* check to see if this changes the tile */ - if(mv[0].video->page[id].dy >= mv[0].dxThresh ) + if(mv[id].page->dy >= mv[0].dxThresh ) { - /* block copy pattern to where we will draw the sprite */ - vga_setup_wm1_block_copy(); -// { -// word i; -// byte o,o2; -// o2 = *mv[0].video->page[id].data+mv[0].video->page[id].pi; -// o = *mv[0].video->page[id].data; -// for (i=0;i < mv[0].video->page[id].height;i++,o += mv[0].video->page[id].width+vga_state.vga_stride,o2 += (*mv[0].video->page[id].data >> 2)) vga_wm1_mem_block_copy(o2,o,*mv[0].video->page[id].data >> 2); -// } - _fmemmove(mv[0].video->page[id].data+mv[0].video->page[id].pi, mv[0].video->page[id].data, mv[0].video->page[id].pagesize); - /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */ - vga_restore_rm0wm0(); +// vga_setup_wm1_block_copy(); +// _fmemmove(mv[id].page->data+mv[id].page->pi, mv[id].page->data, mv[id].page->pagesize); +// vga_restore_rm0wm0(); /* Snap the origin forward */ - mv[0].video->page[id].data += mv[0].video->page[id].pi; - mv[0].video->page[id].dy = mv[0].map->tiles->tileWidth; + mv[id].page->data += mv[id].page->pi; + mv[id].page->dy = mv[0].map->tiles->tileWidth; } } @@ -658,7 +626,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty) // vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15! // } // } - modexCopyPageRegion(mv[3].page, mv[0].page, 0/**/, 0/**/, 32, 16, 16, 32); + modexCopyPageRegion(mv[3].page, mv[0].page, 0/**/, 0/**/, 0, 0, 24, 32); } void near @@ -693,7 +661,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) #endif break; case 1: - modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (t->debug_data[i]+1)); + modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (t->debug_data[i])+1); //modexprintbig(page, x, y, 1, 15, 0, (t->debug_data)); /*for(texty=0; texty<2; texty++) { @@ -785,7 +753,7 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x) }*/ unsigned char shinku_fps_indicator_page = 2; -boolean pageflipflop; +boolean pageflipflop = 1; boolean pageploop = 1; /* sync */ @@ -868,7 +836,7 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll break; } //x-=4; - y-=TILEWH; + y-=pip[0].map->tiles->tileHeight; switch (player[pn].d) { case 0: @@ -900,29 +868,29 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll } #ifdef SPRITE -/*#define FRAME1 PBUFSFUN(pip[PAGENUMB].page, 0, 0, 32, dire, 16, 32, PLAYERBMPDATA); -#define FRAME2 PBUFSFUN(pip[PAGENUMB].page, 0, 0, 16, dire, 16, 32, PLAYERBMPDATA); -#define FRAME3 PBUFSFUN(pip[PAGENUMB].page, 0, 0, 0, dire, 16, 32, PLAYERBMPDATA); -#define FRAME4 PBUFSFUN(pip[PAGENUMB].page, 0, 0, 16, dire, 16, 32, PLAYERBMPDATA);*/ -#define FRAME1 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 32, dire, 16, 32, PLAYERBMPDATA); -#define FRAME2 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 16, dire, 16, 32, PLAYERBMPDATA); -#define FRAME3 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 0, dire, 16, 32, PLAYERBMPDATA); -#define FRAME4 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 16, dire, 16, 32, PLAYERBMPDATA); +#define FRAME1 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 48, dire, 24, 32, PLAYERBMPDATA); +#define FRAME2 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 24, dire, 24, 32, PLAYERBMPDATA); +#define FRAME3 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 0, dire, 24, 32, PLAYERBMPDATA); +#define FRAME4 PBUFSFUN(pip[/*!*/(pip->video->p)].page, x, y, 24, dire, 24, 32, PLAYERBMPDATA); #else -#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 2+dire); -#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+dire); -#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, dire); -#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+dire); - #endif +#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 2+dire); +#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire); +#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, dire); +#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire); +#endif if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 36); - else modexCopyPageRegion(pip[3].page, pip[0].page, bx, by, 0, 0, 16, 32); + 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, pip[!(pip->video->p)].page, x-4, y-4, x-4, y-4, 28, 36);*/ // else modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 40); -//delay(10); switch(ls) { case 1: @@ -942,9 +910,7 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll // if(3>ls && ls>=2) { FRAME2 }else // if(4>ls && ls>=3) { FRAME3 }else // if(5>ls && ls>=4) { FRAME4 } -// delay(500); - //modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0, x, y, 16, 32); -// delay(500); + //modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0, x, y, 24, 32); //printf("x=%d y=%d bx=%d by=%d\n", x, y, bx, by); pip->video->r=1; }