X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.c;h=8d23be69687e7b9c83543114902fb40092929357;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=2d9de4f97622c50ccfddbba95de926e877b199c0;hpb=b2fde6790ba29c4b7ff7119d53a20a02647b73c8;p=16.git diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index 2d9de4f9..8d23be69 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 & yakui-lover + * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -24,429 +24,352 @@ */ #include "src/lib/scroll16.h" -#define INC_PER_FRAME_PRINT sprintf(global_temp_status_text, "%u", player[pn].enti.persist_aniframe);\ -modexprint(&(pip->video->page[0]), player[pn].enti.x-(8*player[pn].enti.persist_aniframe), player[pn].enti.y-TILEWH-(8*player[pn].enti.persist_aniframe), 1, 20, 1, global_temp_status_text); - -//#define WALKTYPE_FRAM_PRINT INC_PER_FRAME_PRINT -//walktypeinfo(player, pn); -//modexprint(&(pip->video->page[0]), player[pn].enti.x-(8*player[pn].enti.persist_aniframe)+8, player[pn].enti.y-TILEWH-(8*player[pn].enti.persist_aniframe), 1, 20, 1, global_temp_status_text); +//check map edge +boolean ZCL_mapEdgeChk(map_view_t *map_v, nibble dir, int tx, int ty, boolean pansw, boolean noscrollsw) +{ + int w,h; -#define PERSIST_ANIFRAME_INIT 1 -#define Q_INIT PERSIST_ANIFRAME_INIT -#define INC_PER_FRAME if(player[pn].enti.q&1) player[pn].enti.persist_aniframe++; if(player[pn].enti.persist_aniframe>4) player[pn].enti.persist_aniframe = PERSIST_ANIFRAME_INIT; + switch (pansw) + { + case 0: + w = map_v[0].map->width; + h = map_v[0].map->height; + break; + case 1: + w = map_v[0].page->ti.tilesw; + h = map_v[0].page->ti.tilesh; + break; + } -void ZC_walk(map_view_t *pip, player_t *player, word pn) -{ - switch(player[pn].enti.d) + switch(dir) { - //no direction + default://no direction case 2: //0000pip[0].video->startclk = (*clockw); + return false; 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 && - !(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; - if(player[pn].enti.q<=player[pn].enti.spt) - { - INC_PER_FRAME; - ANIMATESPRIFUN(pip, player, pn, 2); - ScrollRight(pip, player, 3, pn); - ScrollRight(pip, player, 2, pn); - mapScrollRight(pip, player, (pip[0].video->p), pn); - player[pn].enti.q++; - //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx++; } - } - else if(player[pn].enti.tx < pip[0].map->width && !(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)) - { - player[pn].walktype=1; - if(player[pn].enti.q<=player[pn].enti.spt) - { - INC_PER_FRAME; - player[pn].enti.x+=(player[pn].enti.speed); - ANIMATESPRIFUN(pip, player, pn, 1); - player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx++; } - } - else - { - player[pn].walktype=0; - ANIMATESPRIFUN(pip, player, pn, 0); - player[pn].enti.d = 2; - } - player[pn].enti.triggerx = player[pn].enti.tx+1; - player[pn].enti.triggery = player[pn].enti.ty; + if(noscrollsw) return tx < map_v[0].map->width; + else return (map_v[0].tx >= 0 && map_v[0].tx+map_v[0].page->ti.tw < w); 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 && - !(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; - if(player[pn].enti.q<=player[pn].enti.spt) - { - INC_PER_FRAME; - ANIMATESPRIFUN(pip, player, pn, 2); - ScrollLeft(pip, player, 3, pn); - ScrollLeft(pip, player, 2, pn); - mapScrollLeft(pip, player, (pip[0].video->p), pn); - player[pn].enti.q++; - //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx--; } - } - else if(player[pn].enti.tx > 1 && !(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)) - { - player[pn].walktype=1; - if(player[pn].enti.q<=player[pn].enti.spt) - { - INC_PER_FRAME; - player[pn].enti.x-=(player[pn].enti.speed); - ANIMATESPRIFUN(pip, player, pn, 1); - player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx--; } - } - else - { - player[pn].walktype=0; - ANIMATESPRIFUN(pip, player, pn, 0); - player[pn].enti.d = 2; - } - player[pn].enti.triggerx = player[pn].enti.tx-1; - player[pn].enti.triggery = player[pn].enti.ty; + if(noscrollsw) return tx > 1; + else return (map_v[0].tx > 0 && map_v[0].tx+map_v[0].page->ti.tw <= w); 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 && - !(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; - if(player[pn].enti.q<=player[pn].enti.spt) - { - INC_PER_FRAME; - ANIMATESPRIFUN(pip, player, pn, 2); - ScrollDown(pip, player, 3, pn); - ScrollDown(pip, player, 2, pn); - mapScrollDown(pip, player, (pip[0].video->p), pn); - player[pn].enti.q++; - //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty++; } - } - else if(player[pn].enti.ty < pip[0].map->height && !(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)) - { - player[pn].walktype=1; - if(player[pn].enti.q<=player[pn].enti.spt) - { - INC_PER_FRAME; - player[pn].enti.y+=(player[pn].enti.speed); - ANIMATESPRIFUN(pip, player, pn, 1); - player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty++; } - } - else - { - player[pn].walktype=0; - ANIMATESPRIFUN(pip, player, pn, 0); - player[pn].enti.d = 2; - } - player[pn].enti.triggerx = player[pn].enti.tx; - player[pn].enti.triggery = player[pn].enti.ty+1; + if(noscrollsw) return ty < map_v[0].map->height; + else return (map_v[0].ty >= 0 && map_v[0].ty+map_v[0].page->ti.th < h); 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 && - !(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; - if(player[pn].enti.q<=player[pn].enti.spt) - { - INC_PER_FRAME; - ANIMATESPRIFUN(pip, player, pn, 2); - ScrollUp(pip, player, 3, pn); - ScrollUp(pip, player, 2, pn); - mapScrollUp(pip, player, (pip[0].video->p), pn); - player[pn].enti.q++; - //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty--; } - } - else if(player[pn].enti.ty > 1 && !(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)) - { - player[pn].walktype=1; - if(player[pn].enti.q<=player[pn].enti.spt) - { - INC_PER_FRAME; - player[pn].enti.y-=(player[pn].enti.speed); - ANIMATESPRIFUN(pip, player, pn, 1); - player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty--; } - } - else - { - player[pn].walktype=0; - ANIMATESPRIFUN(pip, player, pn, 0); - player[pn].enti.d = 2; - } - player[pn].enti.triggerx = player[pn].enti.tx; - player[pn].enti.triggery = player[pn].enti.ty-1; + if(noscrollsw) return ty > 1; + else return (map_v[0].ty > 0 && map_v[0].ty+map_v[0].page->ti.th <= h); break; } + return false; } +boolean ZCL_CollCheck(map_view_t *map_v, nibble dir, int tx, int ty) +{ + switch (dir) + { + default://no direction + case 2: + break; + case 3://right + return !(map_v[0].map->layerdata[0].data[(tx)+(map_v[0].map->width*(ty-1))] == 0); + break; + case 1://left + return !(map_v[0].map->layerdata[0].data[(tx-2)+(map_v[0].map->width*(ty-1))] == 0); + break; + case 4://down + return !(map_v[0].map->layerdata[0].data[(tx-1)+(map_v[0].map->width*(ty))] == 0); + break; + case 0://up + return !(map_v[0].map->layerdata[0].data[(tx-1)+(map_v[0].map->width*(ty-2))] == 0); + break; + } + return false; +} -/* -src/lib/scroll16.c: mv[0].video->r=1; -src/lib/scroll16.c: mv[0].video->r=1; -src/lib/scroll16.c: mv[0].video->r=1; -src/lib/scroll16.c: mv[0].video->r=1; -src/lib/scroll16.c: pip->video->r=1; -src/lib/scroll16.c: mv->video->r=1; - */ +boolean ZCL_ScreenMidPosChk(map_view_t *map_v, nibble dir, int tx, int ty) +{ + if(ZCL_mapEdgeChk(map_v, dir, 0, 0, 0, 0)) + switch(dir) + { + default://no direction + case 2: + //0000map_v[0].video->startclk = (*clockw); + return false; + break; + //right movement + case 3: + return tx == map_v[0].tx+map_v[0].page->ti.tilemidposscreenx; + break; + //left movement + case 1: + return tx == map_v[0].tx+map_v[0].page->ti.tilemidposscreenx; + break; + //down movement + case 4: + return ty == map_v[0].ty+map_v[0].page->ti.tilemidposscreeny; + break; + //up movement + case 0: + return ty == map_v[0].ty+map_v[0].page->ti.tilemidposscreeny; + break; + } + return false; +} + +//#define INC_PER_FRAME if(gvar->player[pn].enti.q&1) gvar->player[pn].enti.persist_aniframe++; if(gvar->player[pn].enti.persist_aniframe>4) gvar->player[pn].enti.persist_aniframe = 1; +#ifdef OLDWALKSHOWPAGESTUFF +#define SHOWMVFUN__ VL_ShowPage(&gvar->video.page[0], 1, 0);//modexShowPage(&gvar->video.page); +//ZC_ShowMV(gvar->mv, 1, 0); +#endif -void oldwalk(map_view_t *pip, player_t *player, word pn) +void ZC_walk(global_game_variables_t *gvar, word pn) { - //printf("player[%d].d=%d\n", pn, player[pn].enti.d); - switch(player[pn].enti.d) + switch(gvar->player[pn].enti.d) { //no direction case 2: - //0000pip[0].video->startclk = (*clockw); + //0000gvar->mv[0].video->startclk = (*clockw); break; //right movement case 3: - //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].enti.tx == pip[0].tx+pip[0].page->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! + if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) && + ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx+1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY)) //collision detection! { - if(player[pn].enti.q<=player[pn].enti.spt) + gvar->player[pn].walktype=2; + if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt) { - INC_PER_FRAME; - ANIMATESPRIFUN(pip, player, pn, 1); - 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].enti.q++; - //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx++; } + ZC_animatePlayer(gvar->mv, gvar->player, pn); + ZC_mapScroll(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.q++; + //0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ +#endif + } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx++; } } - else if(player[pn].enti.tx < pip[0].map->width && !(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)) + else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) && + ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx+1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY)) { - if(player[pn].enti.q<=player[pn].enti.spt) + gvar->player[pn].walktype=1; + if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt) { - INC_PER_FRAME; - player[pn].enti.x+=(player[pn].enti.speed); - ANIMATESPRIFUN(pip, player, pn, 0); - if(!pageflipflop) modexShowPage(pip[1].page); - player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx++; } + gvar->player[pn].enti.x+=(gvar->player[pn].enti.spt); + ZC_animatePlayer(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.q++; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ +#endif + } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx++; } } else { - if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32); -#ifdef SPRITE - modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATAPTR); -#else - modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 14); + gvar->player[pn].walktype=0; + ZC_animatePlayer(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.d = 2; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ #endif - if(!pageflipflop) modexShowPage(pip[1].page); - player[pn].enti.d = 2; } - player[pn].enti.triggerx = player[pn].enti.tx+1; - player[pn].enti.triggery = player[pn].enti.ty; + gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx+1; + gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty; 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 && - !(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! + if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) && + ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx-1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY)) //collision detection! { - if(player[pn].enti.q<=player[pn].enti.spt) + gvar->player[pn].walktype=2; + if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt) { - INC_PER_FRAME; - ANIMATESPRIFUN(pip, player, pn, 1); - 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].enti.q++; - //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx--; } + ZC_animatePlayer(gvar->mv, gvar->player, pn); + ZC_mapScroll(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.q++; + //0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ +#endif + } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx--; } } - else if(player[pn].enti.tx > 1 && !(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)) + else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) && + ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx-1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY)) { - if(player[pn].enti.q<=player[pn].enti.spt) + gvar->player[pn].walktype=1; + if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt) { - INC_PER_FRAME; - player[pn].enti.x-=(player[pn].enti.speed); - ANIMATESPRIFUN(pip, player, pn, 0); - if(!pageflipflop) modexShowPage(pip[1].page); - player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.tx--; } + gvar->player[pn].enti.x-=(gvar->player[pn].enti.spt); + ZC_animatePlayer(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.q++; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ +#endif + } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx--; } } else { - if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32); -#ifdef SPRITE - modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATAPTR); -#else - modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 10); + gvar->player[pn].walktype=0; + ZC_animatePlayer(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.d = 2; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ #endif - if(!pageflipflop) modexShowPage(pip[1].page); - player[pn].enti.d = 2; } - player[pn].enti.triggerx = player[pn].enti.tx-1; - player[pn].enti.triggery = player[pn].enti.ty; + gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx-1; + gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty; 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 && - !(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! + if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) && + ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX && gvar->player[pn].enti.ty+1 == TRIGGY)) //collision detection! { - if(player[pn].enti.q<=player[pn].enti.spt) + gvar->player[pn].walktype=2; + if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt) { - INC_PER_FRAME; - ANIMATESPRIFUN(pip, player, pn, 1); - 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].enti.q++; - //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty++; } + ZC_animatePlayer(gvar->mv, gvar->player, pn); + ZC_mapScroll(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.q++; + //0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ +#endif + } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty++; } } - else if(player[pn].enti.ty < pip[0].map->height && !(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)) + else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) && + ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX && gvar->player[pn].enti.ty+1 == TRIGGY)) { - if(player[pn].enti.q<=player[pn].enti.spt) + gvar->player[pn].walktype=1; + if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt) { - INC_PER_FRAME; - player[pn].enti.y+=(player[pn].enti.speed); - ANIMATESPRIFUN(pip, player, pn, 0); - if(!pageflipflop) modexShowPage(pip[1].page); - player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty++; } + gvar->player[pn].enti.y+=(gvar->player[pn].enti.spt); + ZC_animatePlayer(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.q++; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ +#endif + } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty++; } } else { - if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32); -#ifdef SPRITE - modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATAPTR); -#else - modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 9); + gvar->player[pn].walktype=0; + ZC_animatePlayer(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.d = 2; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ #endif - if(!pageflipflop) modexShowPage(pip[1].page); - player[pn].enti.d = 2; } - player[pn].enti.triggerx = player[pn].enti.tx; - player[pn].enti.triggery = player[pn].enti.ty+1; + gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx; + gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty+1; 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 && - !(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! + if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) && + ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX && gvar->player[pn].enti.ty-1 == TRIGGY)) //collision detection! { - if(player[pn].enti.q<=player[pn].enti.spt) + gvar->player[pn].walktype=2; + if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt) { - INC_PER_FRAME; - ANIMATESPRIFUN(pip, player, pn, 1); - 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].enti.q++; - //0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty--; } + ZC_animatePlayer(gvar->mv, gvar->player, pn); + ZC_mapScroll(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.q++; + //0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ +#endif + } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty--; } } - else if(player[pn].enti.ty > 1 && !(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)) + else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) && + ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX && gvar->player[pn].enti.ty-1 == TRIGGY)) { - if(player[pn].enti.q<=player[pn].enti.spt) + gvar->player[pn].walktype=1; + if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt) { - INC_PER_FRAME; - player[pn].enti.y-=(player[pn].enti.speed); - ANIMATESPRIFUN(pip, player, pn, 0); - if(!pageflipflop) modexShowPage(pip[1].page); - player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; player[pn].enti.ty--; } + gvar->player[pn].enti.y-=(gvar->player[pn].enti.spt); + ZC_animatePlayer(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.q++; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ +#endif + } else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty--; } } else { - if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32); -#ifdef SPRITE - modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATAPTR); -#else - modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 12); + gvar->player[pn].walktype=0; + ZC_animatePlayer(gvar->mv, gvar->player, pn); + gvar->player[pn].enti.d = 2; +#ifdef OLDWALKSHOWPAGESTUFF + SHOWMVFUN__ #endif - if(!pageflipflop) modexShowPage(pip[1].page); - player[pn].enti.d = 2; } - player[pn].enti.triggerx = player[pn].enti.tx; - player[pn].enti.triggery = player[pn].enti.ty-1; + gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx; + gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty-1; break; } } + //panning page void ZC_panPageManual(map_view_t *pip, player_t *player, word pn) { -#define SHOWMVFUN_ ZC_ShowMV(pip, 0, 0); +#define SHOWMVFUN_ VL_ShowPage(pip[0].page, 0, 0);//ZC_ShowMV(pip, 0, 0); switch(player[pn].enti.d) { //right movement case 3: - if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tw < pip[0].page->tilesw) + if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 1, 0)) { if(player[pn].enti.q<=player[pn].enti.spt) { pip[0].page->dx+=4; SHOWMVFUN_; player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].tx++; } + } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].tx++; } } break; //left movement case 1: - if(pip[0].tx > 0 && pip[0].tx+pip[0].page->tw <= pip[0].page->tilesw) + if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 1, 0)) { if(player[pn].enti.q<=player[pn].enti.spt) { pip[0].page->dx-=4; SHOWMVFUN_; player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].tx--; } + } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].tx--; } } break; //down movement case 4: - if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->th < pip[0].page->tilesh) + if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 1, 0)) { if(player[pn].enti.q<=player[pn].enti.spt) { pip[0].page->dy+=4; SHOWMVFUN_; player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].ty++; } + } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].ty++; } } break; //up movement case 0: - if(pip[0].ty > 0 && pip[0].ty+pip[0].page->th <= pip[0].page->tilesh) + if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 1, 0)) { if(player[pn].enti.q<=player[pn].enti.spt) { pip[0].page->dy-=4; SHOWMVFUN_; player[pn].enti.q++; - } else { player[pn].enti.q = Q_INIT; player[pn].enti.d = 2; pip[0].ty--; } + } else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].ty--; } } break; } @@ -460,10 +383,12 @@ void ZC_MVSetup(map_view_t *pip, map_t *map, global_game_variables_t *gv) #define ZC_MVI 1 nibble i; // 1st page - pip[0].page = &gv->video.page[0]; - pip[0].map = map; - pip[0].video = &gv->video; - pip[0].panp = &gv->video.panp; + pip[0].page = &gv->video.page[0]; + pip[0].map = map; + pip[0].video = &gv->video; + pip[0].kurokku = &gv->kurokku; + pip[0].p = &gv->video.p; + pip[0].sp = &gv->video.sp; ZC_MVInit(pip, 1, 1); for(i=ZC_MVI;ivideo.num_of_pages;i++) @@ -471,7 +396,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; @@ -487,160 +413,101 @@ void ZC_MVInit(map_view_t *pip, int tx, int ty) //pip[0].ty = pip[1].ty = ty; } +//#if 0 +//for backwards compatibility with code i am lazy ww void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr) { - word high_address, low_address, offset; - byte crtcOffset; - - /* calculate offset */ - offset = (word) moo[moo[0].video->panp].page->data; - offset += moo[0].page->dy * (moo[0].page->width >> 2 ); - offset += moo[0].page->dx >> 2; - - /* calculate crtcOffset according to virtual width */ - switch(sr) - { - case 1: - crtcOffset = moo[0].page->sw >> 3; - break; - default: - case 0: - crtcOffset = moo[0].page->width >> 3; - break; - } - - high_address = HIGH_ADDRESS | (offset & 0xff00); - low_address = LOW_ADDRESS | (offset << 8); - - /* wait for appropriate timing and then program CRTC */ - if(vsync) while ((inp(INPUT_STATUS_1) & DISPLAY_ENABLE)); - outpw(CRTC_INDEX, high_address); - outpw(CRTC_INDEX, low_address); - outp(CRTC_INDEX, 0x13); - outp(CRTC_DATA, crtcOffset); - - /* wait for one retrace */ - if(vsync) while (!(inp(INPUT_STATUS_1) & VRETRACE)); - - /* do PEL panning here */ - outp(AC_INDEX, 0x33); - outp(AC_INDEX, (moo[0].page->dx & 0x03) << 1); + VL_ShowPage(moo[0].page, vsync, sr); } -/*map_t -allocMap(int w, int h) { - map_t result; +#if 0 +void +initMap(map_t *map) { + // just a place holder to fill out an alternating pattern + int x, y; + int i; + int tile = 1; - result.width =w; - result.height=h; - result.data = malloc(sizeof(byte) * w * h); - //result.data = (byte *)alloc_emem(((int)sizeof(byte) * w * h)/1024); - if(isEMS() || checkEMS()) - { - XMOVE mm; - //emmhandle = mallocEMS(coretotalEMS());//alloc_emem((int)sizeof(map)) - mm.length=sizeof(result); - mm.sourceH=0; - mm.sourceOff=ptr2long(&result); - mm.destH=emmhandle; - mm.destOff=0; - ist = move_emem(&mm); - if(!ist){ dealloc_emem(emmhandle); exit(5); } - printf("%d\n", coretotalEMS()); + i=0; + for(y=0; yheight; y++) { + for(x=0; xwidth; x++) { + map->layerdata[0].data[i]=255; +// printf("[%d]", map->layerdata[0].data[i]); + tile = tile ? 0 : 1; + i++; + } + tile = tile ? 0 : 1; } +} - return result; -}*/ - -/*void +void initMap(map_t *map) { - // just a place holder to fill out an alternating pattern - int x, y, xx, yy; - int i, q; -// int tile = 1; - //if(!isEMS() || !checkEMS()) -// map->tiles = malloc(sizeof(tiles_t)); - //else - // map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t)); - - //create the tile set - //if(!isEMS() || !checkEMS()) -// map->tiles->data = malloc(sizeof(bitmap_t)); - //else - // map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t)); -// map->tiles->data->width = (TILEWH); -// map->tiles->data->height= TILEWH; - //if(!isEMS() || !checkEMS()) -// map->tiles->data->data = malloc((TILEWH*2)*TILEWH); - //else - // map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH); -// map->tiles->tileHeight = TILEWH; -// map->tiles->tileWidth =TILEWH; -// map->tiles->rows = 1; -// map->tiles->cols = 1;//2; - - q=0; - //for(y=0; yheight; y++) { - //for(x=0; xwidth; x++) { + /* just a place holder to fill out an alternating pattern */ + int x, y; + int i; + int tile = 1; + map->tiles = malloc(sizeof(tiles_t)); + map->width=20; + map->height=15; + + /* create the tile set */ + map->tiles->spri = malloc(sizeof(sprite_t)); + map->tiles->spri->sprite_vrl_cont.vrl_header->width = (TILEWH*2); + map->tiles->spri->sprite_vrl_cont.vrl_header->height= TILEWH; + map->tiles->spri->sprite_vrl_cont.buffer = malloc((TILEWH*2)*TILEWH); + map->tiles->tileHeight = TILEWH; + map->tiles->tileWidth =TILEWH*2; + map->tiles->rows = 1; + map->tiles->cols = 2; +//#if 0 i=0; - for(yy=0; yytiles->data->data[i+1] = map->data[q];//28;//0x24; -// printf("[%d]", map->tiles->data->data[i]); - //}else{ - //map->tiles->data->data[i] = map->data[q];//0;//0x34; - //printf("]%d[==[%d]", i, map->tiles->data->data[i]); - //} + for(y=0; ytiles->spri->sprite_vrl_cont.buffer[i] = 28;//0x24; + else + map->tiles->spri->sprite_vrl_cont.buffer[i] = 0;//0x34; i++; } -// printf("\n"); } -// printf("[%d]", map->data[q]); - q++; -// } - //printf("\n\n"); -// } - +//#endif i=0; + printf("pee\n"); for(y=0; yheight; y++) { for(x=0; xwidth; x++) { -// map->data[i]=255; - printf("[%d]", map->data[i]); - //tile = tile ? 0 : 1; + map->layerdata[0].data[i] = tile; +// printf("%u ", map->layerdata[0].data[i]); + tile = tile ? 0 : 1; i++; } - //tile = tile ? 0 : 1; +// printf("\n"); + tile = tile ? 0 : 1; } -}*/ +} +#endif +//===========================================================================// + void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid) { word x;//, y; /* coordinate for drawing */ - /* increment the pixel position and update the page */ - mv[id].page[0].dx += player[plid].enti.speed; - - /* check to see if this changes the tile */ - if(mv[id].page[0].dx >= mv[id].dxThresh ) - { - /* go forward one tile */ - mv[id].tx++; - /* Snap the origin forward */ - mv[id].page->data += 4; - - mv[id].page[0].dx = mv[id].map->tiles->tileWidth; - } + ScrollRight(mv, player, id, plid); /* draw the next column */ - x= mv[0].page->sw + mv[id].map->tiles->tileWidth; + x= mv[0].page->sw + mv[0].map->tiles->tileWidth; + if(ZCL_mapEdgeChk(mv, player[plid].enti.d, player[plid].enti.tx, player[plid].enti.ty, 0, 0)) +#ifndef FULLRCREND if(player[plid].enti.q%4) - if(id==0) - mapDrawCol(&mv[0], mv[0].tx + mv[0].page->tw, mv[0].ty-1, x, player, mv->page[0].dx); - 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)); - mv[0].video->r=1; +#else + if(player[plid].enti.q==4) +#endif +// if(id==0) + mapDrawCol(&mv[id], mv[0].tx + mv[0].page->ti.tw, mv[0].ty-1, x, player); +// else +// if(mv[0].video->vga_state.bgps) +// modexCopyPageRegion(mv->page, mv[0].page, x, 0, x, 0, mv[0].map->tiles->tileWidth, mv[0].page->height); + //mv[0].video->dorender=1;//ScrollRight } @@ -648,29 +515,22 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid) { word x;//,y; /* coordinate for drawing */ - /* decrement the pixel position and update the page */ - mv[id].page[0].dx -= player[plid].enti.speed; - - /* check to see if this changes the tile */ - if(mv[id].page[0].dx == 0) - { - /* go backward one tile */ - mv[id].tx--; - /* Snap the origin backward */ - mv[id].page->data -= 4; - - mv[id].page[0].dx = mv[id].map->tiles->tileWidth; - } + ScrollLeft(mv, player, id, plid); /* draw the next column */ x= 0; + if(ZCL_mapEdgeChk(mv, player[plid].enti.d, player[plid].enti.tx, player[plid].enti.ty, 0, 0)) +#ifndef FULLRCREND if(player[plid].enti.q%4) - if(id==0) - mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, mv->page[0].dx); - 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)); - mv[0].video->r=1; +#else + if(player[plid].enti.q==4) +#endif +// if(id==0) + mapDrawCol(&mv[id], mv[0].tx - 1, mv[0].ty-1, x, player); +// else +// if(mv[0].video->vga_state.bgps) +// modexCopyPageRegion(mv->page, mv[0].page, x, 0, x, 0, mv[0].map->tiles->tileWidth, mv[0].page->height); + //mv[0].video->dorender=1;//ScrollLeft } @@ -678,221 +538,161 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid) { word y;//x, /* coordinate for drawing */ - /* decrement the pixel position and update the page */ - mv[id].page[0].dy -= player[plid].enti.speed; - - /* check to see if this changes the tile */ - if(mv[id].page[0].dy == 0 ) - { - /* go down one tile */ - mv[id].ty--; - /* Snap the origin downward */ - mv[id].page->data -= mv[id].page->pi; - - mv[id].page[0].dy = mv[id].map->tiles->tileHeight; - } + ScrollUp(mv, player, id, plid); /* draw the next row */ y= 0; + if(ZCL_mapEdgeChk(mv, player[plid].enti.d, player[plid].enti.tx, player[plid].enti.ty, 0, 0)) +#ifndef FULLRCREND if(player[plid].enti.q%3) - if(id==0) - mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, mv->page[0].dy); - 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); - mv[0].video->r=1; +#else + if(player[plid].enti.q==4) +#endif +// if(id==0) + mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty-1, y, player); +// else +// if(mv[0].video->vga_state.bgps) +// modexCopyPageRegion(mv->page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight); + //mv[0].video->dorender=1;//ScrollUp } + void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid) { word y;//x, /* coordinate for drawing */ - /* increment the pixel position and update the page */ - mv[id].page[0].dy += player[plid].enti.speed; - - /* check to see if this changes the tile */ - if(mv[id].page[0].dy >= mv[id].dyThresh ) - { - /* go down one tile */ - mv[id].ty++; - /* Snap the origin downward */ - mv[id].page->data += mv[id].page->pi; - - mv[id].page[0].dy = mv[id].map->tiles->tileHeight; - } + ScrollDown(mv, player, id, plid); /* draw the next row */ - y= mv[0].page->sh + mv[id].map->tiles->tileHeight; + y= mv[0].page->sh + mv[0].map->tiles->tileHeight; + if(ZCL_mapEdgeChk(mv, player[plid].enti.d, player[plid].enti.tx, player[plid].enti.ty, 0, 0)) +#ifndef FULLRCREND if(player[plid].enti.q%3) - if(id==0) - mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->th, y, player, mv->page[0].dy); - 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); - mv[0].video->r=1; -} - - -//TODO finish this wwww -void near ScrollRight(map_view_t *mv, player_t *player, word id, word plid) -{ - /* increment the pixel position and update the page */ - mv[id].page->dx += player[plid].enti.speed; - - /* check to see if this changes the tile */ - 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[id].page->data += 4; - mv[id].page->dx = mv[0].map->tiles->tileWidth; - } +#else + if(player[plid].enti.q==4) +#endif +// if(id==0) + mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player); +// else +// if(mv[0].video->vga_state.bgps) +// modexCopyPageRegion(mv->page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight); + //mv[0].video->dorender=1;//ScrollDown } -void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid) +void ZC_mapScroll(map_view_t *mv, player_t *player, word pn) { - /* decrement the pixel position and update the page */ - mv[id].page->dx -= player[plid].enti.speed; - - /* check to see if this changes the tile */ - if(mv[id].page->dx == 0) + word b = mv[0].video->vga_state.bgps; + switch(player[pn].enti.d) { -// 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[id].page->data -= 4; - mv[id].page->dx = mv[0].map->tiles->tileWidth; + case 2://none + break; + case 3://right + ScrollRight(mv, player, 3, pn); + ScrollRight(mv, player, 2, pn); + mapScrollRight(mv, player, (0), pn); + if(b) mapScrollRight(mv, player, (1), pn); + break; + case 1://left + ScrollLeft(mv, player, 3, pn); + ScrollLeft(mv, player, 2, pn); + mapScrollLeft(mv, player, (0), pn); + if(b) mapScrollLeft(mv, player, (1), pn); + break; + case 4://down + ScrollDown(mv, player, 3, pn); + ScrollDown(mv, player, 2, pn); + mapScrollDown(mv, player, (0), pn); + if(b) mapScrollDown(mv, player, (1), pn); + break; + case 0://up + ScrollUp(mv, player, 3, pn); + ScrollUp(mv, player, 2, pn); + mapScrollUp(mv, player, (0), pn); + if(b) mapScrollUp(mv, player, (1), pn); + break; } + //mv[0].video->dorender=1;//ZC_mapScroll } -void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid) +//=========================================================================== +//TODO: put player in starting position of assigned spot on map +//default player position on the viewable map +void ZC_PlayerXYpos(int x, int y, player_t *player, map_view_t *pip, boolean defaultsw) { - /* decrement the pixel position and update the page */ - mv[id].page->dy -= player[plid].enti.speed; + player->enti.tx = x + pip[0].tx; + player->enti.ty = y + pip[0].ty; - /* check to see if this changes the tile */ - if(mv[id].page->dy == 0) + switch(defaultsw) { -// 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[id].page->data -= mv[id].page->pi; - mv[id].page->dy = mv[0].map->tiles->tileWidth; + case 1: + player->enti.tx += pip[0].page->ti.tilemidposscreenx; + player->enti.ty += pip[0].page->ti.tilemidposscreeny; + break; + case 0: + break; } } +//=========================================================================== -void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid) +void ZC_checkardmap(map_t *map) { - /* increment the pixel position and update the page */ - mv[id].page->dy += player[plid].enti.speed; + // just a place holder to fill out an alternating pattern + int x, y; + int i; + static byte z[(MAPW*MAPH)];//map->width*map->height]; + byte tile = 1; - /* check to see if this changes the tile */ - 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[id].page->data += mv[id].page->pi; - mv[id].page->dy = mv[0].map->tiles->tileWidth; + i=0; + for(y=0; yheight; y++) { + for(x=0; xwidth; x++) { + z[i]=tile+1; + tile = tile ? 0 : 1; + i++; + } + tile = tile ? 0 : 1; } + map->layerdata[0].data = &z; } -//=========================================================================== -//TODO: put player in starting position of assigned spot on map -//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; -} -//=========================================================================== - sword chkmap(map_t *map, word q) { // bitmap_t bp; - static byte x[(MAPW*MAPH)+1] = -{ 1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10 }; -/*1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, \ -5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ -9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ -13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, \ -0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, \ -1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ -1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ -1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, \ -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, \ -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, \ -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4 };*/ +// static byte x[(MAPW*MAPH)+1] = +//{ 1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10 }; +//1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1 }; +//1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4 }; //check for failed to load map - if((map->width == map->height == 0) && (q>0)) + if((!map->width || !map->height) && (q>0)) { //initiate a null map! - map->width=MAPW;///2; - map->height=MAPH;///2; -// map->data = malloc(((map->width*map->height)+1)*sizeof(byte)); - map->data = &x; - map->tiles = malloc(sizeof(tiles_t)); + map->width=MAPW; + map->height=MAPH; +// map->layerdata[0].data = fmfaflflfofcf(((map->width*map->height)+1)*sizeof(byte)); + ZC_checkardmap(map);//map->layerdata[0].data = &x; //fix this to be far~ // bp = bitmapLoadPcx("data/ed.pcx"); // map->tiles->data = &bp; -#ifdef __DEBUG_MAP__ - dbg_mapdata = map->data; -#endif map->tiles->tileHeight = 16; map->tiles->tileWidth = 16; map->tiles->rows = 1; map->tiles->cols = 1; -#ifdef __DEBUG_MAP__ - dbg_maptext = true; -#endif } -#ifdef __DEBUG_MAP__ - else dbg_maptext = false; -#endif return 0; } //TODO: player position here void mapGoTo(map_view_t *mv, int tx, int ty) { - int py;//px, - unsigned int i; - - mapinitmapview(mv, tx, ty); + ZC_mapinitMV(mv, tx, ty); /* draw the tiles */ modexClearRegion(mv[0].page, 0, 0, mv[0].page->width, mv[0].page->height, 0); - py=0; - 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, 24, 32); + ZC_mapredraw(mv, tx, ty); + + //if(mv[0].video->vga_state.bgps) modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height); } -void mapinitmapview(map_view_t *mv, int tx, int ty) +void ZC_mapinitMV(map_view_t *mv, int tx, int ty) { /* set up the coordinates */ mv[0].tx = mv[1].tx = tx; @@ -902,329 +702,244 @@ void mapinitmapview(map_view_t *mv, int tx, int ty) /* set up the thresholds */ 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; + mv[0].dyThresh = mv[1].dyThresh = mv[2].dyThresh = mv[3].dyThresh = mv->map->tiles->tileHeight * 2; +} + +void ZC_mapredraw(map_view_t *mv, int tx, int ty) +{ + int py;//px, + unsigned int i; + + py=0; + 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); + mapDrawWRow(&mv[1], tx-1, ty, py); + i+=mv->map->width - tx; + } } void near mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) { - word rx; - word ry; - //word textx=0, texty=0; - //if(i==0) i=2; - if(i==0) + word rx, ry; +// printf("%02d ", i); if(x >= page->width - t->tileWidth) printf("\n"); + switch(i) { - //wwww - modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color! - } - else - { - rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth); - ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight); -////0000printf("i=%d\n", i); -#ifdef __DEBUG_MAP__ - switch(dbg_maptext) - { - case 0: -#endif + case 0: + //wwww + modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 1); //currently the over scan color! + break; + default: + rx = (((i-1) % ((t->spri->sprite_vrl_cont.vrl_header->width)/t->tileWidth)) * t->tileWidth); + ry = (((i-1) / ((t->spri->sprite_vrl_cont.vrl_header->height)/t->tileHeight)) * t->tileHeight); #ifndef TILERENDER - modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((dbg_mapdata[i])+1)); - //modexprint(page, x, y, 1, 15, 0, (char const *)(t->debug_data[i])); +#ifdef __DEBUG_RF__ + if(!dbg_pagenorendermap) +#endif + modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i+1); #else - modexDrawBmpRegion (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) */ - //draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header)); - //modexDrawBmpRegion (page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data)); + modexDrawBmpRegion (page, x, y, rx, ry, t->tileWidth, t->tileHeight, i); + //draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header)); + //modexDrawBmpRegion (page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data)); #endif #ifdef __DEBUG_MAP__ - break; - case 1: - modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (dbg_mapdata[i])+1); - //modexprintbig(page, x, y, 1, 15, 0, (t->debug_data)); - /*for(texty=0; texty<2; texty++) - { - for(textx=0; textx<2; textx++) - {*/ -// modexprint(page, x+(textx*8), y+(texty*8), 1, (word)(t->debug_data), 0, (t->debug_data)); -/* } - }*/ - break; - } + if(dbg_maptext){ sprintf(global_temp_status_text2, "%u", i); modexprint(page, x, y, 1, 0, 1, 2, 1, global_temp_status_text2); } #endif + break; } } - -void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, word poopoffset) +#define PALMAPDRAWW 13 +void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player) { - word x; int i; - poopoffset%=player[0].enti.speed; -//printf("y: %d\n", poopoffset); +#if defined(FULLRCREND) || defined(__DEBUG_RF__) + word drawtileoffset=0; +//printf("y: %d ", drawtileoffset); + drawtileoffset%=player[0].enti.spt; +//printf("%d\n", drawtileoffset); +#endif +#ifdef __DEBUG_RF__ +if(dbg_pagedelayrendermap){ if(!y) y+=TILEWH; else y-=TILEWH; + sprintf(global_temp_status_text, "%-3u", drawtileoffset); modexprint(mv->page, player[0].enti.x, player[0].enti.y-28-(drawtileoffset*8) , 1, 0, PALMAPDRAWW, 1, 1, global_temp_status_text); } +#endif /* the position within the map array */ i=ty * mv->map->width + tx; - for(x=poopoffset; x<(mv->page->sw+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) { - if(i>=0) { - /* we are in the map, so copy! */ - mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y); - } - i++; /* next! */ + /* + */ +#ifndef FULLRCREND + for( mv->dx=drawtileoffset; mv->dx<(mv->page->sw+mv->dxThresh)/(drawtileoffset+1) && tx < mv->map->width; mv->dx+=mv->map->tiles->tileWidth, tx++) { +#else + for(mv->dx=0; mv->dxpage->sw+mv->dxThresh && tx < mv->map->width; mv->dx+=mv->map->tiles->tileWidth, tx++) { +#endif + if(i>=0) + mapDrawTile(mv->map->tiles, mv->map->layerdata[0].data[i], mv->page, mv->dx, y); + i++; /* next! */ } +#ifdef __DEBUG_RF__ +if(dbg_pagedelayrendermap) DBG_RFDELAYMETHOD; +#endif } -void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, word poopoffset) + + + + + + + +void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player) { - int y; int i; - poopoffset%=player[0].enti.speed; -//printf("x: %d\n", poopoffset); +#if defined(FULLRCREND) || defined(__DEBUG_RF__) + word drawtileoffset=0; +//printf("x: %d ", drawtileoffset); + drawtileoffset%=player[0].enti.spt; +//printf("%d\n", drawtileoffset); +#endif +#ifdef __DEBUG_RF__ +if(dbg_pagedelayrendermap){ if(!x) x+=TILEWH; else x-=TILEWH; + sprintf(global_temp_status_text, "%-3u", drawtileoffset); modexprint(mv->page, player[0].enti.x, player[0].enti.y-28-(drawtileoffset*8) , 1, 0, PALMAPDRAWW, 1, 1, global_temp_status_text); } +#endif /* location in the map array */ i=ty * mv->map->width + tx; - /* We'll copy all of the columns in the screen, i + 1 row above and one below */ - for(y=poopoffset; y<(mv->page->sh+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) { - if(i>=0) { - /* we are in the map, so copy away! */ - mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y); - } - i += mv->map->width; +#ifndef FULLRCREND + for( mv->dy=drawtileoffset; mv->dy<(mv->page->sh+mv->dyThresh)/(drawtileoffset+1) && ty < mv->map->height; mv->dy+=mv->map->tiles->tileHeight, ty++) { +#else + for(mv->dy=0; mv->dypage->sh+mv->dyThresh && ty < mv->map->height; mv->dy+=mv->map->tiles->tileHeight, ty++) { +#endif + if(i>=0) + mapDrawTile(mv->map->tiles, mv->map->layerdata[0].data[i], mv->page, x, mv->dy); + i += mv->map->width; } +#ifdef __DEBUG_RF__ +if(dbg_pagedelayrendermap) DBG_RFDELAYMETHOD; +#endif } void mapDrawWRow(map_view_t *mv, int tx, int ty, word y) { - word x; - int i; + int i; nibble z; /* the position within the map array */ i=ty * mv->map->width + tx; - for(x=0; xpage->sw+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) { - if(i>=0) { - /* we are in the map, so copy! */ - mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y); - } - i++; /* next! */ + for(mv->dx=0; mv->dxpage->sw+mv->dxThresh && tx < mv->map->width; mv->dx+=mv->map->tiles->tileWidth, tx++) { + if(i>=0){ /* we are in the map, so copy! */ + mapDrawTile(mv->map->tiles, mv->map->layerdata[0].data[i], mv->page, mv->dx, y); + for(z=1;z<=2;z++) + if(mv->map->layerdata[z].data[i]){ + sprintf(global_temp_status_text2, "%u", mv->map->layerdata[z].data[i]); modexprint(mv->page, mv->dx, y, 1, 0, PALMAPDRAWW, z+2, 1, global_temp_status_text2); + //mapDrawTile(mv->map->tiles, mv->map->layerdata[z].data[i], mv->page, mv->dx, y); + } + } + i++; /* next! */ } } void mapDrawWCol(map_view_t *mv, int tx, int ty, word x) { - int y; - int i; + int i; nibble z; /* location in the map array */ i=ty * mv->map->width + tx; /* We'll copy all of the columns in the screen, i + 1 row above and one below */ - for(y=0; ypage->sh+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) { - if(i>=0) { - /* we are in the map, so copy away! */ - mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y); - } - i += mv->map->width; + for(mv->dy=0; mv->dypage->sh+mv->dyThresh && ty < mv->map->height; mv->dy+=mv->map->tiles->tileHeight, ty++) { + if(i>=0){ /* we are in the map, so copy away! */ + mapDrawTile(mv->map->tiles, mv->map->layerdata[0].data[i], mv->page, x, mv->dy); + for(z=1;z<=2;z++) + if(mv->map->layerdata[z].data[i]){ + sprintf(global_temp_status_text2, "%u", mv->map->layerdata[z].data[i]); modexprint(mv->page, x, mv->dy, 1, 0, PALMAPDRAWW, z+2, 1, global_temp_status_text2); + //mapDrawTile(mv->map->tiles, mv->map->layerdata[z].data[i], mv->page, x, mv->dy); + } + } + i += mv->map->width; } } -/*void qclean() -{ - //setkb(0); -}*/ - -boolean pageflipflop = 1; -boolean pageploop = 1; /* sync */ void shinku(global_game_variables_t *gv) { - 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 col = 7, bgcol = 0, type = 1;//w = 64, h = 8, - //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 */ -// vga_setup_wm1_block_copy(); -// modexCopyPageRegion(&(gv->video.page[gv->video->sfip]), &(gv->video.page[!gv->video->sfip]), x, y, x+w, 0, w, h); -// o = *(gv->video.page[2].data); // source offscreen -// o2 = *(gv->video.page[gv->video->sfip].data)+(y * vga_state.vga_stride) + (x >> 2); // dest visible (original stride) -// for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += vga_state.vga_stride) vga_wm1_mem_block_copy(o2,o,w >> 2); - /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */ -// vga_restore_rm0wm0(); +#ifdef SHOWFPS + word x = gv->video.page[/*!*/(gv->video.p)].dx; //(gv->video.page[(gv->video.p)].tlx) - // follow the screen + word y = gv->video.page[/*!*/(gv->video.p)].dy; //(gv->video.page[(gv->video.p)].tly) - // follow the screen + word col = 2, bgcol = 1, type = 1;//w = 64, h = 8, +#endif if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second)) { +#ifdef SHOWFPS // NTS: For some bizarre reason, gv->pee is not initialized, but the pointer is not NULL even - // though it should be. Instead it's NULL as a near pointer but contains a non-null + // though it should be. Instead it's NULL as a neAr pointer but contains a non-null // segment value, so testing against NULL doesn't work. It is initialized properly if - // you call start_timer() though which uses near malloc. Rather than fight with that, + // you call start_timer() though which uses neAr mAlloc. Rather than fight with that, // I decided it would be better to declare a temp buffer statically and sprintf to that. // // This fixes *** Null pointer assignment detected error message in ZCROLL.EXE on exit. sprintf(global_temp_status_text, "%.0f fps", (double)gv->kurokku.tiku/ticktock(gv)); - //modexClearRegion(&(gv->video.page[gv->video->sfip]), x, y, w, h, 45); - modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, col, bgcol, global_temp_status_text); + //modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, 1, col, bgcol, global_temp_status_text); + if(gv->kurokku.wcpu) + { + modexCopyPageRegion(&gv->video.page[0], &gv->video.page[1], + gv->video.page[/*!*/(gv->video.p)].dx, + gv->video.page[/*!*/(gv->video.p)].dy, + gv->video.page[/*!*/(gv->video.p)].dx, + gv->video.page[/*!*/(gv->video.p)].dy, + 96, 16); + modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, 1, col, bgcol, 1, global_temp_status_text); +//0000printf("dx=%u dy=%u\n", gv->video.page[/*!*/(gv->video.p)].dx, gv->video.page[/*!*/(gv->video.p)].dy); + } +#endif gv->kurokku.tiku=0; - /* block copy to visible RAM from offscreen */ -// vga_setup_wm1_block_copy(); -// o = *(gv->video.page[gv->video->sfip].data); // source offscreen -// o2 = *(gv->video.page[2].data)+(y * vga_state.vga_stride) + (x >> 2); // dest visible (original stride) -// for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += vga_state.vga_stride) vga_wm1_mem_block_copy(o2,o,w >> 2); -// modexCopyPageRegion(&(gv->video.page[gv->video->sfip]), &(gv->video.page[!gv->video->sfip]), x, y, x, 0, w, h); - /* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */ -// vga_restore_rm0wm0(); }else //copy dat sheet gv->kurokku.tiku++; - switch(gv->kurokku.fpscap) - { - case 0: - //modexprint(&(gv->video.page[gv->video->sfip]), 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(); - gv->kurokku.frames_per_second=60; - break; - } - if(pageflipflop){ - 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; + //render!! + if(gv->video.dorender) + {//r=1 + /*if(video->bgp s) + { + modexCopyPageRegion(&(gv->video.page[ ]), &(gv->video.page[ ]), 0, 0, 0, 0, gv->video.page[ ].width, gv->video.page[ ].height); + }else{ + //modexCopyPageRegion(&video->page[0], &video->page[1], enti->x, enti->y, 0, 0, 24, 32); + }*/ +#ifndef OLDWALKSHOWPAGESTUFF + VL_ShowPage(&(gv->video.page[gv->video.sp]), gv->kurokku.fpscap, 0); +#endif + gv->video.dorender =!gv->video.dorender; //0000gv->video.tickclk = ((*clockw)-gv->video.startclk)/18.2; } - } -} -void near ZC_drawframe(map_view_t *pip, entity_t *enti, sword x, sword y) -{ - switch(pip[0].video->rss) - { - case 0: - animate_spri(enti, pip->video); - break; - case 1: - animate_spri(enti, pip->video); - break; -// case 2: -// modexClearRegion(&(pip[0].page[0]), x, y, 16, 32, player[pn].enti.dire); -// break; - } -} - -#ifdef SPRITE -#define FRAME1 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 48, player[pn].enti.dire, 24, 32, PLAYERBMPDATAPTR); -#define FRAME2 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, player[pn].enti.dire, 24, 32, PLAYERBMPDATAPTR); -#define FRAME3 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 0, player[pn].enti.dire, 24, 32, PLAYERBMPDATAPTR); -#define FRAME4 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, player[pn].enti.dire, 24, 32, PLAYERBMPDATAPTR); -#else -#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 2+player[pn].enti.dire); -#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+player[pn].enti.dire); -#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, player[pn].enti.dire); -#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 16, 32, 1+player[pn].enti.dire); -#endif - -void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch) -{ - sword x = player[pn].enti.x; - sword y = player[pn].enti.y; - sword bx = x+16; //buffer's x - sword by = y+16; //buffer's y - sword qq; //scroll offset - word ls = player[pn].enti.persist_aniframe; - player[pn].enti.dire=32; //direction - - switch(scrollswitch) - { - case 0: - qq = 0; - break; - default: - qq = ((player[pn].enti.q)*(player[pn].enti.speed)); - break; - } - //x-=4; - y-=pip[0].map->tiles->tileHeight; - switch (player[pn].enti.d) + switch(gv->kurokku.fpscap) { - case 0: - //up - player[pn].enti.dire*=player[pn].enti.d; - y-=qq; - by-=4; - break; - case 3: - // right - player[pn].enti.dire*=(player[pn].enti.d-2); - x+=qq; - bx+=4; - break; - case 2: - break; - case 4: - //down - player[pn].enti.dire*=(player[pn].enti.d-2); - y+=qq; - by+=4; + case 0: //turn this off if XT + //modexprint(&(gv->video.page[0]), x, y+8, type, 1, col, bgcol, "sanic!"); + gv->kurokku.frames_per_second=1; break; case 1: - //left - player[pn].enti.dire*=(player[pn].enti.d+2); - x-=qq; - bx-=4; - 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); - } -//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 +//#ifndef OLDWALKSHOWPAGESTUFF + //vga_wait_for_vsync(); + vga_wait_for_vsync_end(); +//#else + //modexWaitBorder(); +//#endif + gv->kurokku.frames_per_second=FPSVALUE; 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, 24, 32); - //printf("x=%d y=%d bx=%d by=%d\n", x, y, bx, by); - pip->video->r=1; + PM_NextFrame(gv); } -void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch) +void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn) { sword x = player[pn].enti.x; sword y = player[pn].enti.y; sword qq,dd; //scroll offset player[pn].enti.dire=10; //direction - switch(scrollswitch) + switch(player[pn].walktype) { case 0: dd = 0; @@ -1236,7 +951,7 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr break; case 2: dd = 1; - qq = ((player[pn].enti.q)*(player[pn].enti.speed)); + qq = player[pn].enti.q*player[pn].enti.spt; break; } x-=4; @@ -1267,21 +982,33 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr break; } player[pn].enti.dire+=dd; - if((player[pn].enti.q==1 && player[pn].enti.pred != player[pn].enti.d) || !dd) + //setting xy position + player[pn].enti.spri.x = x; + player[pn].enti.spri.y = y; + + if((player[pn].enti.q==1 && player[pn].enti.pred != player[pn].enti.d) || !dd)//when dir changed OR when player change face direction { - set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire); //pip->video->sprifilei = set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire); if(pip->video->sprifilei == -1){ printf("ERROR! %u\n", player[pn].enti.dire); return; } + //0000printf(" q=%u pred=%u d=%u dd=%u\n", player[pn].enti.q, player[pn].enti.pred, player[pn].enti.d, dd); + set_anim_by_id(&player[pn].enti.spri, player[pn].enti.dire); //pip->video->sprifilei = set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire); if(pip->video->sprifilei == -1){ printf("ERROR! %u\n", player[pn].enti.dire); return; } player[pn].enti.pred = player[pn].enti.d; + if(!dd)//changed direction while NOT moving! + { + modexCopyPageRegion(pip[0].page, pip[1].page, x-4, y-4, x-4, y-4, 28, 40); + animate_spri(&player[pn].enti, pip[0].video); + } } - //setting xy position - player[pn].enti.spri->x = x; - player[pn].enti.spri->y = y; - - //draw sprite - ZC_drawframe(pip, &player[pn].enti, x, y); -//if(player[pn].enti.q<4) delay(500); - pip->video->r=1; - //WALKTYPE_FRAM_PRINT; + if(pip[0].video->vga_state.bgps && dd)//if moving wwww + { + modexCopyPageRegion(pip[0].page, pip[1].page, x-4, y-4, x-4, y-4, 28, 40); + + //draw sprite + animate_spri(&player[pn].enti, pip[0].video); + } +//0000if(player[pn].enti.q<4) delay(200); +#ifdef OLDWALKSHOWPAGESTUFF + modexWaitBorder(); +#endif } /* @@ -1333,14 +1060,19 @@ 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? } } -void near mapScroll(map_view_t *mv, player_t *player) +/* + * end + */ + + +void mapScroll(map_view_t *mv, player_t *player) { //word x, y; /* coordinate for drawing */ int c = 1; @@ -1372,6 +1104,12 @@ void near mapScroll(map_view_t *mv, player_t *player) default: break; } +} - mv->video->r=1; +void ZC_GirdChk (global_game_variables_t *gvar, player_t *player) +{ + if((player->enti.q==1) && + !(player->enti.x%gvar->mv[0].map->tiles->tileWidth==0 && player->enti.y%gvar->mv[0].map->tiles->tileHeight==0)) + ZC_PlayerXYpos(0, 0, player, gvar->mv, 1); + //TODO: MAKE SURE TO RESYNC PLAYER IN WALKABLE SPOT }