From: sparky4 Date: Tue, 24 Jan 2017 16:24:01 +0000 (-0600) Subject: pushing some changes! X-Git-Url: http://git.osdn.net/view?p=proj16%2F16.git;a=commitdiff_plain;h=da4383658112cbffd9559bd275696f53e0a5e57c pushing some changes! --- diff --git a/DEBUG.16W b/DEBUG.16W deleted file mode 100755 index 7703117d..00000000 --- a/DEBUG.16W +++ /dev/null @@ -1,210 +0,0 @@ -Seg:0 Size:9873 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++000 -Seg:2758 Size:44 Owner:0x0 -++ -Seg:2784 Size:256 Owner:0x1970 -++++ -Seg:2884 Size:256 Owner:0x1762 -++++ -Seg:2984 Size:256 Owner:0x1764 -+++++ -Seg:2a84 Size:256 Owner:0x1766 -++++ -Seg:2b84 Size:256 Owner:0x1768 -++++ -Seg:2c84 Size:256 Owner:0x176a -++++ -Seg:2d84 Size:256 Owner:0x176c -++++ -Seg:2e84 Size:256 Owner:0x176e -+++++ -Seg:2f84 Size:256 Owner:0x1770 -++++ -Seg:3084 Size:256 Owner:0x1772 -++++ -Seg:3184 Size:256 Owner:0x1774 -++++ -Seg:3284 Size:256 Owner:0x1776 -++++ -Seg:3384 Size:256 Owner:0x1778 -+++++ -Seg:3484 Size:256 Owner:0x177a -++++ -Seg:3584 Size:256 Owner:0x177c -++++ -Seg:3684 Size:256 Owner:0x177e -++++ -Seg:3784 Size:256 Owner:0x1780 -++++ -Seg:3884 Size:256 Owner:0x1782 -+++++ -Seg:3984 Size:256 Owner:0x1784 -++++ -Seg:3a84 Size:256 Owner:0x1786 -++++ -Seg:3b84 Size:256 Owner:0x1788 -++++ -Seg:3c84 Size:256 Owner:0x178a -++++ -Seg:3d84 Size:256 Owner:0x178c -+++++ -Seg:3e84 Size:256 Owner:0x178e -++++ -Seg:3f84 Size:256 Owner:0x1790 -++++ -Seg:4084 Size:256 Owner:0x1792 -++++ -Seg:4184 Size:256 Owner:0x1794 -++++ -Seg:4284 Size:256 Owner:0x1796 -+++++ -Seg:4384 Size:256 Owner:0x1798 -++++ -Seg:4484 Size:256 Owner:0x179a -++++ -Seg:4584 Size:256 Owner:0x179c -++++ -Seg:4684 Size:256 Owner:0x179e -++++ -Seg:4784 Size:256 Owner:0x17a0 -+++++ -Seg:4884 Size:256 Owner:0x17a2 -++++ -Seg:4984 Size:256 Owner:0x17a4 -++++ -Seg:4a84 Size:256 Owner:0x17a6 -++++ -Seg:4b84 Size:256 Owner:0x17a8 -++++ -Seg:4c84 Size:256 Owner:0x17aa -+++++ -Seg:4d84 Size:256 Owner:0x17ac -++++ -Seg:4e84 Size:256 Owner:0x17ae -++++ -Seg:4f84 Size:256 Owner:0x17b0 -++++ -Seg:5084 Size:256 Owner:0x17b2 -++++ -Seg:5184 Size:256 Owner:0x17b4 -+++++ -Seg:5284 Size:256 Owner:0x17b6 -++++ -Seg:5384 Size:256 Owner:0x17b8 -++++ -Seg:5484 Size:256 Owner:0x17ba -++++ -Seg:5584 Size:256 Owner:0x17bc -++++ -Seg:5684 Size:256 Owner:0x17be -+++++ -Seg:5784 Size:256 Owner:0x17c0 -++++ -Seg:5884 Size:256 Owner:0x17c2 -++++ -Seg:5984 Size:256 Owner:0x17c4 -++++ -Seg:5a84 Size:256 Owner:0x17c6 -++++ -Seg:5b84 Size:256 Owner:0x17c8 -+++++ -Seg:5c84 Size:256 Owner:0x17ca -++++ -Seg:5d84 Size:256 Owner:0x17cc -++++ -Seg:5e84 Size:256 Owner:0x17ce -++++ -Seg:5f84 Size:256 Owner:0x17d0 -++++ -Seg:6084 Size:256 Owner:0x17d2 -+++++ -Seg:6184 Size:256 Owner:0x17d4 -++++ -Seg:6284 Size:256 Owner:0x17d6 -++++ -Seg:6384 Size:256 Owner:0x17d8 -++++ -Seg:6484 Size:256 Owner:0x17da -++++ -Seg:6584 Size:256 Owner:0x17dc -+++++ -Seg:6684 Size:256 Owner:0x17de -++++ -Seg:6784 Size:256 Owner:0x17e0 -++++ -Seg:6884 Size:256 Owner:0x17e2 -++++ -Seg:6984 Size:256 Owner:0x17e4 -++++ -Seg:6a84 Size:256 Owner:0x17e6 -+++++ -Seg:6b84 Size:256 Owner:0x17e8 -++++ -Seg:6c84 Size:256 Owner:0x17ea -++++ -Seg:6d84 Size:256 Owner:0x17ec -++++ -Seg:6e84 Size:256 Owner:0x17ee -++++ -Seg:6f84 Size:256 Owner:0x17f0 -+++++ -Seg:7084 Size:256 Owner:0x17f2 -++++ -Seg:7184 Size:256 Owner:0x17f4 -++++ -Seg:7284 Size:256 Owner:0x17f6 -++++ -Seg:7384 Size:256 Owner:0x17f8 -++++ -Seg:7484 Size:256 Owner:0x17fa -+++++ -Seg:7584 Size:256 Owner:0x17fc -++++ -Seg:7684 Size:256 Owner:0x17fe -++++ -Seg:7784 Size:256 Owner:0x1800 -++++ -Seg:7884 Size:256 Owner:0x1802 -++++ -Seg:7984 Size:256 Owner:0x1804 -+++++ -Seg:7a84 Size:256 Owner:0x1806 -++++ -Seg:7b84 Size:256 Owner:0x1808 -++++ -Seg:7c84 Size:256 Owner:0x180a -++++ -Seg:7d84 Size:256 Owner:0x180c -++++ -Seg:7e84 Size:256 Owner:0x180e -+++++ -Seg:7f84 Size:256 Owner:0x1810 -++++ -Seg:8084 Size:256 Owner:0x1812 -++++ -Seg:8184 Size:256 Owner:0x1814 -++++ -Seg:8284 Size:256 Owner:0x1816 -++++ -Seg:8384 Size:256 Owner:0x1818 -+++++ -Seg:8484 Size:256 Owner:0x181a -++++ -Seg:8584 Size:256 Owner:0x181c -++++ -Seg:8684 Size:256 Owner:0x181e -++++ -Seg:8784 Size:256 Owner:0x1820 -++++ -Seg:8884 Size:256 Owner:0x1822 -+++++ -Seg:8984 Size:256 Owner:0x1824 -++++ -Seg:8a84 Size:256 Owner:0x1826 -++++ -Seg:8b84 Size:256 Owner:0x1828 -++++ -Seg:8c84 Size:401 Owner:0xef42 -++++++ -Seg:b784 Size:18555 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W deleted file mode 100755 index 6080bedd..00000000 --- a/HEAP.16W +++ /dev/null @@ -1,69 +0,0 @@ - - == default == - - USED block at 277a0016 of size 136 - FREE block at 277a009e of size 68 - USED block at 277a00e2 of size 50 - USED block at 277a0114 of size 50 - USED block at 277a0146 of size 50 - USED block at 277a0178 of size 50 - USED block at 277a01aa of size 50 - USED block at 277a01dc of size 50 - USED block at 277a020e of size 50 - USED block at 277a0240 of size 50 - USED block at 277a0272 of size 50 - USED block at 277a02a4 of size 50 - USED block at 277a02d6 of size 50 - USED block at 277a0308 of size 50 - FREE block at 277a033a of size 14 - USED block at 277a0348 of size 20 - FREE block at 277a035c of size 7328 -OK - end of heap - - == near == - - USED block at 1779ef86 of size 12 - USED block at 1779ef92 of size 330 - USED block at 1779f0dc of size 52 - USED block at 1779f110 of size 20 - USED block at 1779f124 of size 20 - USED block at 1779f138 of size 20 - USED block at 1779f14c of size 20 - USED block at 1779f160 of size 20 - USED block at 1779f174 of size 3720 -OK - end of heap - - == far == - - USED block at 277a0016 of size 136 - USED block at 277a009e of size 68 - USED block at 277a00e2 of size 50 - USED block at 277a0114 of size 50 - USED block at 277a0146 of size 50 - USED block at 277a0178 of size 50 - USED block at 277a01aa of size 50 - USED block at 277a01dc of size 50 - USED block at 277a020e of size 50 - USED block at 277a0240 of size 50 - USED block at 277a0272 of size 50 - USED block at 277a02a4 of size 50 - USED block at 277a02d6 of size 50 - USED block at 277a0308 of size 50 - USED block at 277a033a of size 14 - USED block at 277a0348 of size 20 - USED block at 277a035c of size 7328 -OK - end of heap - -Memory Type Total Used Free ----------------- -------- -------- -------- -Default 8166 756 7410 -Near 4214 494 3720 -Far 8166 756 7410 ----------------- -------- -------- -------- -coreleft = 3718 -farcoreleft = 35534 -GetFreeSize = 31836 -GetNearFreeSize = 3720 -GetFarFreeSize = 31836 -memavl = 3718 -stackavail = 31545 diff --git a/MMDUMP.16W b/MMDUMP.16W deleted file mode 100755 index 7a2c9d96..00000000 Binary files a/MMDUMP.16W and /dev/null differ diff --git a/src/bakapi.c b/src/bakapi.c index 381badd1..e7adbd22 100755 --- a/src/bakapi.c +++ b/src/bakapi.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -107,7 +107,12 @@ main(int argc, char *argvar[]) bakapee.bakax=0; bakapee.bakay=0; bakapee.coor=0; + + //once where #defines bakapee.tile=0; + bakapee.bonk=400; + bakapee.lgq=32; + bakapee.hgq=55; /* setup camera and screen~ */ gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]); @@ -220,6 +225,7 @@ main(int argc, char *argvar[]) printf("on.\n"); break; } + printf("Incrementation of color happens at every %uth plot.\n", bakapee.bonk); printf("Enter 1, 2, 3, 4, 5, 6, 8, or 9 to run a screensaver, or enter 0 to quit.\n"); pee: c = getch(); @@ -268,6 +274,15 @@ pee: // we'll integrate DOSLIB vga into that part of the code instead for less disruption. -- J.C. modexShowPage(&gvar.video.page[0]); break; + case '-': + if(bakapee.bonk>0) + bakapee.bonk-=100; + break; + case '=': + case '+': + if(bakapee.bonk<1000) + bakapee.bonk+=100; + break; default: key=0; break; diff --git a/src/lib/16_enti.c b/src/lib/16_enti.c new file mode 100755 index 00000000..1d8a1b93 --- /dev/null +++ b/src/lib/16_enti.c @@ -0,0 +1,22 @@ +/* Project 16 Source Code~ + * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + diff --git a/src/lib/16_enti.h b/src/lib/16_enti.h index 4e92d990..bfda2c15 100755 --- a/src/lib/16_enti.h +++ b/src/lib/16_enti.h @@ -1,3 +1,25 @@ +/* Project 16 Source Code~ + * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + #ifndef __16_NPC__ #define __16_NPC__ diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h index 126ae581..125e0a23 100755 --- a/src/lib/16_tdef.h +++ b/src/lib/16_tdef.h @@ -137,9 +137,9 @@ typedef struct int triggery; //entity's trigger box tile position on the viewable map int sheetsetx; //NOT USED YET! entity sprite sheet set on the image x int sheetsety; //NOT USED YET! entity sprite sheet set on the image y - byte d; //direction to render sprite!! wwww + nibble d; //direction to render sprite!! wwww word dire; //sprite in use - byte q; //loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www + nibble q,preq; //loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www word speed; //entity speed! word spt; //speed per tile struct sprite *spri; // sprite used by entity diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c index 408c349e..8199666f 100755 --- a/src/lib/16_vl.c +++ b/src/lib/16_vl.c @@ -296,7 +296,7 @@ void modexHiganbanaPageSetup(video_t *video) video->omemptr= vga_state.vga_graphics_ram; video->vga_draw_stride= vga_state.vga_draw_stride; video->vga_draw_stride_limit= vga_state.vga_draw_stride_limit; - + //sprite render switch video->rs=0; //setup the buffersize diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c index 3b45f105..917784f5 100755 --- a/src/lib/bakapee.c +++ b/src/lib/bakapee.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -42,11 +42,11 @@ void colortest(page_t *page, bakapee_t *pee) //color ‚Ä‚·‚Æ void colorz(page_t *page, bakapee_t *pee) { - if(pee->coor <= HGQ) + if(pee->coor <= pee->hgq) { modexcls(page, pee->coor, VGA); pee->coor++; - }else pee->coor = LGQ; + }else pee->coor = pee->lgq; } //slow spectrum down @@ -75,12 +75,7 @@ void dingpp(page_t *page, bakapee_t *pee) { if(pee->tile) { -#ifndef MXLIB - //fill_block(pee->xx, pee->yy, pee->xx+TILEWH, pee->yy+TILEWH, pee->coor); - mxFillBox(pee->xx, pee->yy, TILEWH, TILEWH, pee->coor, OP_SET); -#else modexClearRegion(page, pee->xx, pee->yy, TILEWH, TILEWH, pee->coor); -#endif } else modexputPixel(page, pee->xx, pee->yy, pee->coor); @@ -107,7 +102,7 @@ void dingo(page_t *page, bakapee_t *pee) //assigning values from randomizer void dingas(bakapee_t *pee) { - if(pee->gq == BONK) dingu(pee); + if(pee->gq == pee->bonk) dingu(pee); if(!pee->bakax) { if(pee->tile) @@ -136,7 +131,7 @@ void dingas(bakapee_t *pee) void dingaso(bakapee_t *pee) { - if(pee->gq == BONK) dingu(pee); + if(pee->gq == pee->bonk) dingu(pee); if(!pee->bakax) { if(pee->tile) @@ -165,19 +160,19 @@ void dingaso(bakapee_t *pee) void dingu(bakapee_t *pee) { - if(pee->coor < HGQ && pee->coor < LGQ) pee->coor = LGQ; - if(pee->coor < HGQ) + if(pee->coor < pee->hgq && pee->coor < pee->lgq) pee->coor = pee->lgq; + if(pee->coor < pee->hgq) { pee->coor++; }else{ - pee->coor = LGQ; + pee->coor = pee->lgq; } } //randomizer void dingq(bakapee_t *pee) { - if(pee->gqgqbonk) { pee->gq++; } @@ -191,7 +186,7 @@ void dingq(bakapee_t *pee) void dingqo(bakapee_t *pee) { - if(pee->gqgqbonk) { pee->gq++; pee->bakax = rand()%3; pee->bakay = rand()%3; @@ -211,7 +206,7 @@ void ding(page_t *page, bakapee_t *pee, word q) { word tx=0,ty=0;//d3y, -//++++ if(q <= 4 && q!=2 && gq == BONK-1) coor = rand()%HGQ; +//++++ if(q <= 4 && q!=2 && gq == pee->bonk-1) coor = rand()%pee->hgq; switch(q) { case 1:/* @@ -289,22 +284,22 @@ void ding(page_t *page, bakapee_t *pee, word q) modexcls(page, pee->coor, VGA); break; case 7: - if(pee->coor <= HGQ) + if(pee->coor <= pee->hgq) { ssd(page, pee, q); pee->coor++; - }else pee->coor = LGQ; + }else pee->coor = pee->lgq; break; case 8: colorz(page, pee); modexprint(page, page->sw/2, page->sh/2, 1, 47, 0, "bakapi"); break; case 9: - if(pee->coor <= HGQ) + if(pee->coor <= pee->hgq) { ssd(page, pee, q); pee->coor++; - }else pee->coor = LGQ; + }else pee->coor = pee->lgq; break; case 10: ssd(page, pee, q); /*printf("%d\n", pee->coor);*/ diff --git a/src/lib/bakapee.h b/src/lib/bakapee.h index f734f2e5..06c5e705 100755 --- a/src/lib/bakapee.h +++ b/src/lib/bakapee.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 + * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -23,46 +23,14 @@ #ifndef __BAKAPEE_H_ #define __BAKAPEE_H_ -/* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover - * - * This file is part of Project 16. - * - * Project 16 is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * Project 16 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see , or - * write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301 USA. - * - */ #include "src/lib/16_head.h" #include "src/lib/16_vl.h" #include #include #include -//#include "src/lib/modex/modex.h" -//#include "16/x/modex.h" - -#define TILEWH 16 -#define QUADWH TILEWH/2 -#define BONK 400 -#define LGQ 32 -#define HGQ 55 - -#define TILE - -//which lib? -#define MXLIB +#define TILEWH 16 +#define QUADWH TILEWH/2 typedef struct { word gq; @@ -70,6 +38,7 @@ typedef struct { sword xx, yy, sx, sy; byte coor; boolean tile; + word bonk,lgq,hgq; } bakapee_t; void clrstdin(); diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index 63a094a0..df5af21d 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -74,17 +74,11 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) else { player[pn].walktype=0; -//#ifdef SPRITE -//modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATAPTR); ANIMATESPRIFUN(pip, player, pn, 0); -//#else -// modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 14); -//#endif player[pn].enti.d = 2; } player[pn].enti.triggerx = player[pn].enti.tx+1; player[pn].enti.triggery = player[pn].enti.ty; - //WALKTYPE_FRAM_PRINT break; //left movement case 1: @@ -117,17 +111,11 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) else { player[pn].walktype=0; -//#ifdef SPRITE -//modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATAPTR); ANIMATESPRIFUN(pip, player, pn, 0); -//#else -// modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 10); -//#endif player[pn].enti.d = 2; } player[pn].enti.triggerx = player[pn].enti.tx-1; player[pn].enti.triggery = player[pn].enti.ty; - //WALKTYPE_FRAM_PRINT break; //down movement case 4: @@ -160,17 +148,11 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) else { player[pn].walktype=0; -//#ifdef SPRITE -//modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATAPTR); ANIMATESPRIFUN(pip, player, pn, 0); -//#else -// modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 9); -//#endif player[pn].enti.d = 2; } player[pn].enti.triggerx = player[pn].enti.tx; player[pn].enti.triggery = player[pn].enti.ty+1; - //WALKTYPE_FRAM_PRINT break; //up movement case 0: @@ -203,21 +185,13 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) else { player[pn].walktype=0; -//#ifdef SPRITE -//modexDrawSpriteRegion(pip[0].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATAPTR); ANIMATESPRIFUN(pip, player, pn, 0); -//#else -// modexClearRegion(pip[1].page, player[pn].enti.x, player[pn].enti.y-TILEWH, 24, 32, 12); -//#endif player[pn].enti.d = 2; } player[pn].enti.triggerx = player[pn].enti.tx; player[pn].enti.triggery = player[pn].enti.ty-1; - //WALKTYPE_FRAM_PRINT break; } - //if(player[pn].enti.d!=2 && pip[0].video->rs) IN_UserInput(1,1); - //else if(!pip[0].video->rs) delay(500); } @@ -903,7 +877,8 @@ void mapGoTo(map_view_t *mv, int tx, int ty) mapDrawWRow(&mv[0], tx-1, ty, py); i+=mv->map->width - tx; } - if(!pageploop) modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height); + //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 */ @@ -1319,6 +1294,12 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr break; } pip->video->r=1; + if(player[pn].enti.persist_aniframe!=player[pn].enti.q) + { + sprintf(global_temp_status_text, "[%u]%u", player[pn].enti.persist_aniframe, player[pn].enti.q); + 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); + delay(500); + } //WALKTYPE_FRAM_PRINT; //sprintf(global_temp_status_text, " %u", player[pn].enti.dire); //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); diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h index c2bacfbd..396798e0 100755 --- a/src/lib/scroll16.h +++ b/src/lib/scroll16.h @@ -94,6 +94,7 @@ typedef struct { //printf("gvar.kurokku: "); printf("%.0f ", clock()); printf("tiku=%lu ", gvar.kurokku.tiku); printf("t=%.0f ", gvar.kurokku.t); printf("ticktock()=%f ", ticktock(&gvar)); printf("%.0f fps", (double)gvar.kurokku.tiku/ticktock(&gvar)); //printf("map.width=%d map.height=%d map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]); //printf("&global_temp_status_text = %Fp\n", &global_temp_status_text); +//print_anim_ids(player[0].ent->spri); #define SCROLLEXITMESG printf("tx: %d ", mv[0].tx);\ printf("ty: %d\n", mv[0].ty);\ printf("\n");\ @@ -115,7 +116,6 @@ typedef struct { \ printf("gvar.video.p=%u ", gvar.video.p); printf("gvar.video.r=%u ", gvar.video.r);\ printf("pageflipflop=%u\n", pageflipflop);\ - print_anim_ids(player[0].ent->spri);\ printf("\n"); #define SHOWMVFUN ZC_ShowMV(&mv, 0, 0); @@ -160,7 +160,6 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x); void shinku(global_game_variables_t *gv); void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, sword y, word sw); void near 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 scrollswitch); void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch); // Move an entity around. Should actually be in 16_entity diff --git a/src/test.c b/src/test.c index b85e7859..c933f953 100755 --- a/src/test.c +++ b/src/test.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -24,7 +24,9 @@ #include "src/lib/16_vl.h" #include "src/lib/16_in.h" #include "src/lib/scroll16.h" -#include "src/lib/bakapee.h" + +#define LGQ 32 +#define HGQ 55 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */