X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.c;h=eb83157e71866405efb4d4bb62b6c7d697556d74;hb=848c772e64209441c696de3d8101f7b3b81f1354;hp=6282480a254261494c1793fb182112bdfcffd8ea;hpb=80b3d6cc928bc94a01aa357bca85d077ec5fba2f;p=16.git diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index 6282480a..eb83157e 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -27,24 +27,30 @@ void walk(map_view_t *pip, player_t *player, word pn) { #define INC_PER_FRAME if(player[pn].q&1) player[pn].persist_aniframe++; if(player[pn].persist_aniframe>4) player[pn].persist_aniframe = 1; + //printf("player[%d].d=%d\n", pn, player[pn].d); switch(player[pn].d) { + //no direction + case 2: + //0000pip[0].video->startclk = (*clockw); + break; //right movement case 3: - //printf("pip[0].page->tilesw=%d\n", pip[0].page->tilesw); - if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tilesw < pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx && + //printf("pip[0].page->tilesw=%d ", pip[0].page->tilesw); printf("pip[0].page->tw=%d\n", pip[0].page->tw); + if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tw < pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx && !(pip[0].map->data[(player[pn].tx)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx+1 == TRIGGX && player[pn].ty == TRIGGY)) //collision detection! { if(player[pn].q<=player[pn].spt) { INC_PER_FRAME; animatePlayer(pip, player, pn, 1); - mapScrollRight(pip, player, 0, pn); - mapScrollRight(pip, player, 1, pn); - ScrollRight(pip, player, 2, 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); if(!pageflipflop) modexShowPage(pip[1].page); player[pn].q++; + //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; } else { player[pn].q = 1; player[pn].d = 2; player[pn].tx++; } } else if(player[pn].tx < pip[0].map->width && !(pip[0].map->data[(player[pn].tx)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx+1 == TRIGGX && player[pn].ty == TRIGGY)) @@ -60,11 +66,11 @@ void walk(map_view_t *pip, player_t *player, word pn) } else { - modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32); + 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); #ifdef SPRITE - PBUFSFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATA); + PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 16, 32, 16, 32, PLAYERBMPDATA); #else - modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 14); + modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 16, 32, 14); #endif if(!pageflipflop) modexShowPage(pip[1].page); player[pn].d = 2; @@ -75,19 +81,20 @@ void walk(map_view_t *pip, player_t *player, word pn) //left movement case 1: - if(pip[0].tx > 0 && pip[0].tx+pip[0].page->tilesw <= pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx && + if(pip[0].tx > 0 && pip[0].tx+pip[0].page->tw <= pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx && !(pip[0].map->data[(player[pn].tx-2)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx-1 == TRIGGX && player[pn].ty == TRIGGY)) //collision detection! { if(player[pn].q<=player[pn].spt) { INC_PER_FRAME; animatePlayer(pip, player, pn, 1); - mapScrollLeft(pip, player, 0, pn); - mapScrollLeft(pip, player, 1, pn); - ScrollLeft(pip, player, 2, 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); if(!pageflipflop) modexShowPage(pip[1].page); player[pn].q++; + //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; } else { player[pn].q = 1; player[pn].d = 2; player[pn].tx--; } } else if(player[pn].tx > 1 && !(pip[0].map->data[(player[pn].tx-2)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx-1 == TRIGGX && player[pn].ty == TRIGGY)) @@ -103,11 +110,11 @@ void walk(map_view_t *pip, player_t *player, word pn) } else { - modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32); + 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); #ifdef SPRITE - PBUFSFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATA); + PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 16, 96, 16, 32, PLAYERBMPDATA); #else - modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 10); + modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 16, 32, 10); #endif if(!pageflipflop) modexShowPage(pip[1].page); player[pn].d = 2; @@ -118,19 +125,20 @@ void walk(map_view_t *pip, player_t *player, word pn) //down movement case 4: - if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->tilesh < pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny && + if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->th < pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty+1 == TRIGGY)) //collision detection! { if(player[pn].q<=player[pn].spt) { INC_PER_FRAME; animatePlayer(pip, player, pn, 1); - mapScrollDown(pip, player, 0, pn); - mapScrollDown(pip, player, 1, pn); - ScrollDown(pip, player, 2, 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); if(!pageflipflop) modexShowPage(pip[1].page); player[pn].q++; + //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; } else { player[pn].q = 1; player[pn].d = 2; player[pn].ty++; } } else if(player[pn].ty < pip[0].map->height && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty+1 == TRIGGY)) @@ -146,11 +154,11 @@ void walk(map_view_t *pip, player_t *player, word pn) } else { - modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32); + 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); #ifdef SPRITE - PBUFSFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATA); + PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 16, 64, 16, 32, PLAYERBMPDATA); #else - modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 9); + modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 16, 32, 9); #endif if(!pageflipflop) modexShowPage(pip[1].page); player[pn].d = 2; @@ -161,19 +169,20 @@ void walk(map_view_t *pip, player_t *player, word pn) //up movement case 0: - if(pip[0].ty > 0 && pip[0].ty+pip[0].page->tilesh <= pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny && + if(pip[0].ty > 0 && pip[0].ty+pip[0].page->th <= pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty-2))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty-1 == TRIGGY)) //collision detection! { if(player[pn].q<=player[pn].spt) { INC_PER_FRAME; animatePlayer(pip, player, pn, 1); - mapScrollUp(pip, player, 0, pn); - mapScrollUp(pip, player, 1, pn); - ScrollUp(pip, player, 2, 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); if(!pageflipflop) modexShowPage(pip[1].page); player[pn].q++; + //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; } else { player[pn].q = 1; player[pn].d = 2; player[pn].ty--; } } else if(player[pn].ty > 1 && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty-2))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty-1 == TRIGGY)) @@ -189,11 +198,11 @@ void walk(map_view_t *pip, player_t *player, word pn) } else { - modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32); + 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); #ifdef SPRITE - PBUFSFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATA); + PBUFSFUN(pip[0].page, player[pn].x, player[pn].y-TILEWH, 16, 0, 16, 32, PLAYERBMPDATA); #else - modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 12); + modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 16, 32, 12); #endif if(!pageflipflop) modexShowPage(pip[1].page); player[pn].d = 2; @@ -204,63 +213,64 @@ void walk(map_view_t *pip, player_t *player, word pn) } } +//panning page void panpagemanual(map_view_t *pip, player_t *player, word pn) { switch(player[pn].d) { //right movement case 3: - if(pip[pip[0].pan->pn].tx >= -TILEWH && pip[pip[0].pan->pn].tx+pip[pip[0].pan->pn].page->tilesw < pip[pip[0].pan->pn].map->width+TILEWH) + if(pip[pip[0].pan->pn].tx >= 0 && pip[pip[0].pan->pn].tx+pip[pip[0].pan->pn].page->tw < pip[pip[0].pan->pn].page->tilesw) { if(player[pn].q<=player[pn].spt) { - pip[pip[0].pan->pn].page->dx++; + pip[pip[0].pan->pn].page->dx+=4; modexShowPage(pip[pip[0].pan->pn].page); player[pn].q++; - } else { player[pn].q = 1; player[pn].d = 2; }//pip[pip[0].pan->pn].tx++; } + } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].tx++; } } - printf("player[pn].d=%u player[pn].q=%u\n", player[pn].d, player[pn].q); break; //left movement case 1: - if(pip[pip[0].pan->pn].tx > -TILEWH && pip[pip[0].pan->pn].tx+pip[pip[0].pan->pn].page->tilesw <= pip[pip[0].pan->pn].map->width+TILEWH) + if(pip[pip[0].pan->pn].tx > 0 && pip[pip[0].pan->pn].tx+pip[pip[0].pan->pn].page->tw <= pip[pip[0].pan->pn].page->tilesw) { if(player[pn].q<=player[pn].spt) { - pip[pip[0].pan->pn].page->dx--; + pip[pip[0].pan->pn].page->dx-=4; modexShowPage(pip[pip[0].pan->pn].page); player[pn].q++; - } else { player[pn].q = 1; player[pn].d = 2; }//pip[pip[0].pan->pn].tx--; } + } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].tx--; } } break; //down movement case 4: - if(pip[pip[0].pan->pn].ty >= -TILEWH && pip[pip[0].pan->pn].ty+pip[pip[0].pan->pn].page->tilesh < pip[pip[0].pan->pn].map->height+TILEWH) + if(pip[pip[0].pan->pn].ty >= 0 && pip[pip[0].pan->pn].ty+pip[pip[0].pan->pn].page->th < pip[pip[0].pan->pn].page->tilesh) { if(player[pn].q<=player[pn].spt) { - pip[pip[0].pan->pn].page->dy++; + pip[pip[0].pan->pn].page->dy+=4; modexShowPage(pip[pip[0].pan->pn].page); player[pn].q++; - } else { player[pn].q = 1; player[pn].d = 2; }//pip[pip[0].pan->pn].ty++; } + } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].ty++; } } break; //up movement case 0: - if(pip[pip[0].pan->pn].ty > -TILEWH && pip[pip[0].pan->pn].ty+pip[pip[0].pan->pn].page->tilesh <= pip[pip[0].pan->pn].map->height+TILEWH) + if(pip[pip[0].pan->pn].ty > 0 && pip[pip[0].pan->pn].ty+pip[pip[0].pan->pn].page->th <= pip[pip[0].pan->pn].page->tilesh) { if(player[pn].q<=player[pn].spt) { - pip[pip[0].pan->pn].page->dy--; + pip[pip[0].pan->pn].page->dy-=4; modexShowPage(pip[pip[0].pan->pn].page); player[pn].q++; - } else { player[pn].q = 1; player[pn].d = 2; }//pip[pip[0].pan->pn].ty--; } + } else { player[pn].q = 1; player[pn].d = 2; pip[pip[0].pan->pn].ty--; } } break; } + //if (player[pn].d!=2) printf("player[%u].d=%u player[%u].q=%u\n", pn, player[pn].d, pn, player[pn].q); } /*map_t @@ -364,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; } @@ -371,10 +382,11 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid) x= mv[0].page->sw + mv[id].map->tiles->tileWidth; if(player[plid].q%4) if(id==0) - mapDrawCol(&mv[0], mv[0].tx + mv[0].page->tilesw, mv[0].ty-1, x, player, mv->page->dx); + mapDrawCol(&mv[0], mv[0].tx + mv[0].page->tw, mv[0].ty-1, x, player, mv->page->dx); else - modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->tilesh+2)); - //} + 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; } @@ -390,9 +402,9 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid) { /* go backward one tile */ mv[id].tx--; - /* Snap the origin backward */ mv[id].page->data -= 4; + mv[id].page->dx = mv[id].map->tiles->tileWidth; } @@ -402,8 +414,9 @@ 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 - modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->tilesh+2)); - //} + 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; } @@ -420,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; } @@ -430,8 +444,9 @@ 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 - modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tilesw+2), mv[id].map->tiles->tileHeight); - //} + 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; } void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid) @@ -447,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; } @@ -455,10 +471,11 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid) y= mv[0].page->sh + mv[id].map->tiles->tileHeight; if(player[plid].q%3) if(id==0) - mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->tilesh, y, player, mv->page->dy); + mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->th, y, player, mv->page->dy); else - modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tilesw+2), mv[id].map->tiles->tileHeight); - //} + 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; } @@ -466,61 +483,69 @@ 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[id].dxThresh ) + if(mv[id].page->dx >= mv[0].dxThresh ) { +// 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) { +// 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) { +// 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 -= 4; - 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[id].dxThresh ) + if(mv[id].page->dy >= mv[0].dxThresh ) { +// 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 += 4; - 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; } -// modexClearRegion(&(mv[0].video->page[id]), 0, 0, -// mv[0].video->page[id].width-1, -// mv[0].video->page[id].height-1, id*2); } sword chkmap(map_t *map, word q) @@ -566,32 +591,44 @@ sword chkmap(map_t *map, word q) return 0; } +//TODO: player position here void mapGoTo(map_view_t *mv, int tx, int ty) { int px, py; unsigned int i; /* set up the coordinates */ - mv->tx = tx; - mv->ty = ty; - mv->page->dx = mv->map->tiles->tileWidth; - mv->page->dy = mv->map->tiles->tileHeight; + mv[0].tx = mv[1].tx = tx; + mv[0].ty = mv[1].ty = ty; + mv[0].page->dx = mv[1].page->dx = mv[2].page->dx = mv[3].page->dx = mv->map->tiles->tileWidth; + mv[0].page->dy = mv[1].page->dy = mv[2].page->dy = mv[3].page->dy = mv->map->tiles->tileHeight; /* set up the thresholds */ - mv->dxThresh = mv->map->tiles->tileWidth * 2; - mv->dyThresh = mv->map->tiles->tileHeight * 2; + mv[0].dxThresh = mv[1].dxThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileWidth * 2; + mv[0].dyThresh = mv[1].dyThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileHeight * 2; /* draw the tiles */ - modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0); + modexClearRegion(mv[0].page, 0, 0, mv[0].page->width, mv[0].page->height, 0); py=0; - i=mv->ty * mv->map->width + mv->tx; - for(ty=mv->ty-1; py < mv->page->sh+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) { - mapDrawWRow(mv, tx-1, ty, py); + i=mv[0].ty * mv[0].map->width + mv[0].tx; + for(ty=mv[0].ty-1; py < mv[0].page->sh+mv->dyThresh && ty < mv[0].map->height; ty++, py+=mv[0].map->tiles->tileHeight) { + 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! +// } +// } + modexCopyPageRegion(mv[3].page, mv[0].page, 0/**/, 0/**/, 0, 0, 16, 32); } - void near mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) { @@ -615,7 +652,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) case 0: #ifndef TILERENDER modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((t->debug_data[i])+1)); - //cannot print number value du to it being slow as bakapee + //modexprint(page, x, y, 1, 15, 0, (char const *)(t->debug_data[i])); #else PBUFBFUN (page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data)); /* then the sprite. note modding ram ptr means we just draw to (x&3,0) */ @@ -624,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++) { @@ -715,20 +752,16 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x) //setkb(0); }*/ -unsigned char shinku_fps_indicator_page = 0; +unsigned char shinku_fps_indicator_page = 2; boolean pageflipflop; -//gv->video.p +boolean pageploop = 1; /* sync */ void shinku(global_game_variables_t *gv) { - word x = (0) + gv->video.page[shinku_fps_indicator_page].dx; // follow the screen - word y = (0) + gv->video.page[shinku_fps_indicator_page].dy; // follow the screen - word w = 64; - word h = 8; - word col = 7; - word bgcol = 0; - word type = 1; + word x = (0) + gv->video.page[/*!*/(gv->video.p)].dx; // follow the screen + word y = (0) + gv->video.page[/*!*/(gv->video.p)].dy; // follow the screen + word w = 64, h = 8, col = 7, bgcol = 0, type = 1; byte o,o2,i; //modexCopyPageRegion(pip[1].page, pip[2].page, 16, 16, 16, 16, (14*8)+4, 8+4); /* block copy to visible RAM from offscreen */ @@ -743,7 +776,7 @@ void shinku(global_game_variables_t *gv) { sprintf(gv->pee, "%.0f fps", (double)gv->kurokku.tiku/ticktock(gv)); //modexClearRegion(&(gv->video.page[shinku_fps_indicator_page]), x, y, w, h, 45); - modexprint(&(gv->video.page[shinku_fps_indicator_page]), x, y, type, col, bgcol, gv->pee); + modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, col, bgcol, gv->pee); gv->kurokku.tiku=0; /* block copy to visible RAM from offscreen */ // vga_setup_wm1_block_copy(); @@ -759,51 +792,64 @@ void shinku(global_game_variables_t *gv) switch(gv->kurokku.fpscap) { case 0: - modexprint(&(gv->video.page[shinku_fps_indicator_page]), x, y+8, type, col, bgcol, "sanic!"); + //modexprint(&(gv->video.page[shinku_fps_indicator_page]), x, y+8, type, col, bgcol, "sanic!"); gv->kurokku.frames_per_second=1; break; case 1: //turn this off if XT - modexWaitBorder(); - //vga_wait_for_vsync(); + //modexWaitBorder(); + vga_wait_for_vsync(); gv->kurokku.frames_per_second=60; break; } if(pageflipflop){ - 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); + if(gv->video.r){ + //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); modexShowPage(&(gv->video.page[gv->video.p])); - + if(!pageploop) gv->video.p=!gv->video.p; + gv->video.r=!gv->video.r; + //0000gv->video.tickclk = ((*clockw)-gv->video.startclk)/18.2; + } } - gv->video.p=!gv->video.p; } void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch) { sword x = player[pn].x; sword y = player[pn].y; -#ifdef SPRITE + sword bx = x+16; //buffer's x + sword by = y+16; //buffer's y word dire=32; //direction -#else - word dire=8; //direction -#endif sword qq; //scroll offset word ls = player[pn].persist_aniframe; - if(scrollswitch==0) qq = 0; - else qq = ((player[pn].q)*(player[pn].speed)); - x-=4; - y-=TILEWH; + switch(scrollswitch) + { + case 0: + qq = 0; + break; + default: + qq = ((player[pn].q)*(player[pn].speed)); + break; + } + //x-=4; + y-=pip[0].map->tiles->tileHeight; switch (player[pn].d) { case 0: //up dire*=player[pn].d; y-=qq; + by-=4; break; case 3: // right dire*=(player[pn].d-2); x+=qq; + bx+=4; break; case 2: break; @@ -811,39 +857,60 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll //down dire*=(player[pn].d-2); y+=qq; + by+=4; break; case 1: //left dire*=(player[pn].d+2); x-=qq; + bx-=4; break; } #ifdef SPRITE -// #define FRAME1 PBUFSFUN(pip[1].page, x, y, 48, dire, 24, 32, PLAYERBMPDATA); -// #define FRAME2 PBUFSFUN(pip[1].page, x, y, 24, dire, 24, 32, PLAYERBMPDATA); -// #define FRAME3 PBUFSFUN(pip[1].page, x, y, 0, dire, 24, 32, PLAYERBMPDATA); -// #define FRAME4 PBUFSFUN(pip[1].page, x, y, 24, dire, 24, 32, PLAYERBMPDATA); -#define FRAME1 PBUFSFUN(pip[1].page, x, y, 48, dire, 24, 32, PLAYERBMPDATA); -#define FRAME2 PBUFSFUN(pip[1].page, x, y, 24, dire, 24, 32, PLAYERBMPDATA); -#define FRAME3 PBUFSFUN(pip[1].page, x, y, 0, dire, 24, 32, PLAYERBMPDATA); -#define FRAME4 PBUFSFUN(pip[1].page, x, y, 24, dire, 24, 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); #else -#define FRAME1 modexClearRegion(pip[1].page, x, y, 24, 32, 2+dire); -#define FRAME2 modexClearRegion(pip[1].page, x, y, 24, 32, 1+dire); -#define FRAME3 modexClearRegion(pip[1].page, x, y, 24, 32, dire); -#define FRAME4 modexClearRegion(pip[1].page, x, y, 24, 32, 1+dire); - #endif - if(pageflipflop) - modexCopyPageRegion(pip[pip->video->p].page, - pip[!(pip->video->p)].page, x-4, y-4, x-4, y-4, 28, 40); - else modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 40); - //modexCopyPageRegion(pip[2].page, pip[1].page, 16, 16, 16, 16, (14*8)+4, 8+4); - if(2>ls && ls>=1) { FRAME1 }else - if(3>ls && ls>=2) { FRAME2 }else - if(4>ls && ls>=3) { FRAME3 }else - if(5>ls && ls>=4) { FRAME4 } - //TODO: mask copy //modexCopyPageRegion(dest->page, src->page, x-4, y-4, x-4, y-4, 28, 40); - //modexClearRegion(top->page, 66, 66, 2, 40, 0); - //modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40); +#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 + 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, + 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); + switch(ls) + { + case 1: + FRAME1 + break; + case 2: + FRAME2 + break; + case 3: + FRAME3 + break; + case 4: + FRAME4 + break; + } +// if(2>ls && ls>=1) { FRAME1 }else +// if(3>ls && ls>=2) { FRAME2 }else +// if(4>ls && ls>=3) { FRAME3 }else +// if(5>ls && ls>=4) { FRAME4 } + //modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0, x, y, 16, 32); + //printf("x=%d y=%d bx=%d by=%d\n", x, y, bx, by); + pip->video->r=1; }