From 7fca9c1d3c1676ab3e6c6b60e98ffcb339b355c9 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Tue, 7 Jun 2016 11:29:41 -0500 Subject: [PATCH] wwww --- makefile | 2 +- scroll.l16 | 0 scroll.smp | Bin 1933 -> 547 bytes src/lib/scroll16.c | 26 ++++++++++++++------------ 4 files changed, 15 insertions(+), 13 deletions(-) create mode 100755 scroll.l16 diff --git a/makefile b/makefile index d6cc76f9..4f5488fe 100755 --- a/makefile +++ b/makefile @@ -69,7 +69,7 @@ WLIBQ=-q WCLQ=-zq $(WLIBQ) UPXQ=-qqq -AFLAGS=-mh -0 -d2 +AFLAGS=-mh -0 -d1 16FLAGS=-fh=16.hed BAKAPIFLAGS=-fh=bakapi.hed SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000 diff --git a/scroll.l16 b/scroll.l16 new file mode 100755 index 00000000..e69de29b diff --git a/scroll.smp b/scroll.smp index 8e4889b3062e54c7124ea094d0c0b032181a8510..aee990a56f82dda7959b2339462158c846c198b2 100755 GIT binary patch literal 547 zcmWG{3~~1NRR}1`Ps_|nEmBBHEJ;)VF%`m$^o)49q!`Q@7#LE3c;Pi50RlXX5E@8= zSRn{5TpY##Nr?b4h*pKtKng2RWng0nU%z+rBkq1#va}@5E|LBSVkdw_(!eA{7ewV1U;yP>EC7>0uQPBkurs{9$HWA5I0FE( CG-SsB literal 1933 zcmZvdTS!z<6o!vdHt1O4NJONZ45NsI6iN!|GG#$Z!Gxj=p)^|J;AN675Yh#rdJsx_ zC=e^^v8WfL7gLA{A|i>5=tj`xA$q7@3)<`dM%-Wr{Lh+yuf6uaF8kQLZGU`kW4JHV z+u4=w$b_l(f%eeMu&KJLy0~yzP@WeAsUQe$OgpeA>WJK9)_B3pueonqFLi(RuFSpN z>%UKBP!NPao0?gSZ%Vc%*KbH3Ihg59r>i=ScZe?y=6jn{wf1AYAkQ7p@2qU=Dk1g( zkExU0AcV)~f|x}@m{YPXaJKcna7;LQ-j$*Dk;^0&zuRbt{cEAw!z*p|!D6%LEjN2g zp7=bI{ZiPkRhTd3<~b>T)QO12w}i%At}q-F-V?4B&#nvox4vc^{5tu}luB<9YTX~0JLE!XH+{G0Pn)h4#PqD&lf&4?rhh4>8Z zG3JsGhU|y~*1I-D5~n?%!eV2(#hi`M9jd#UgnMffUA3h~LxrnZx^hlRvP|B#!9NTR365PRT`)s1uU%!nBja$?%E zPsr{Q&fRrVJcue{K309$byPmA4tScW6{CsK`!QkYHJyUFs0zcENtK`1XQ@RG{(YWKm>&5oDW2`oRmCiELp^h^ z@gxoknI(AYh7EpH%yKU#{3r3#WwU1yhYF(~PkPGayw|R+su`w)&ZJI80qU5co1fM@q%QvS=wT0)7OnLrSyj3Fe zHSl}NUg|bi|3gLd`P*JhZUk9$N;%W(cb2>3&mp_Ii!6&*x)-c+Pnjt6_}?ObdfV(D i)kOaaLp-k^vcA-G8J@jn=+=Trups#HAwS=J&Vzrtw, 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->th+2)); +// 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->th+2)); }else mapDrawCol(&mv[(!mv[0].video->p)], mv[0].tx + mv[0].page->tw, mv[0].ty-1, x, player, mv->page->dx); } @@ -417,8 +417,8 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid) if(pageflipflop){ 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->th+2)); +// 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->th+2)); }else mapDrawCol(&mv[(!mv[0].video->p)], mv[0].tx - 1, mv[0].ty-1, x, player, mv->page->dx); } @@ -446,8 +446,8 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid) if(pageflipflop){ 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->tw+2), mv[id].map->tiles->tileHeight); +// else +// modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tw+2), mv[id].map->tiles->tileHeight); }else mapDrawRow(&mv[(!mv[0].video->p)], mv[0].tx - 1, mv[0].ty-1, y, player, mv->page->dy); } @@ -474,8 +474,8 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid) if(pageflipflop){ if(id==0) 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->tw+2), mv[id].map->tiles->tileHeight); +// else +// modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tw+2), mv[id].map->tiles->tileHeight); }else mapDrawRow(&mv[(!mv[0].video->p)], mv[0].tx - 1, mv[0].ty+mv[0].page->th, y, player, mv->page->dy); } @@ -608,6 +608,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty) i+=mv->map->width - tx; } modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height); + modexCopyPageRegion(mv[3].page, mv[!(mv->video->p)].page, 0/**/, 0/**/, 0, 128, 28, 36); } @@ -634,7 +635,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)); - modexprint(page, x, y, 1, 15, 0, (char const *)(t->debug_data[i])); + //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) */ @@ -841,6 +842,7 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll break; } + //modexCopyPageRegion(pip[!(pip->video->p)].page, pip[3].page, 0, 128, x-4, y-4, 28, 36); #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); @@ -858,10 +860,10 @@ void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scroll #endif // if(pageflipflop) //modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height); - modexCopyPageRegion(pip[pip->video->p].page, - pip[!(pip->video->p)].page, x-4, y-4, x-4, y-4, 28, 36); + //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); - //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 -- 2.39.5