From: sparky4 Date: Mon, 23 Jan 2017 23:48:16 +0000 (-0600) Subject: ====animation mostly converted==== old bug resurfaced as animation is 12341234 instea... X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=2f48a575694447fa08b963f0e815033dc4c358e8;p=16.git ====animation mostly converted==== old bug resurfaced as animation is 12341234 instead of the proper 11223344 --- diff --git a/DEBUG.16W b/DEBUG.16W new file mode 100755 index 00000000..7703117d --- /dev/null +++ b/DEBUG.16W @@ -0,0 +1,210 @@ +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 new file mode 100755 index 00000000..6080bedd --- /dev/null +++ b/HEAP.16W @@ -0,0 +1,69 @@ + + == 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 new file mode 100755 index 00000000..7a2c9d96 Binary files /dev/null and b/MMDUMP.16W differ diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index 72bce275..819e5290 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -1289,8 +1289,9 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr } player[pn].enti.dire++; player[pn].ent->spri->delay=1; - //TODO this needs to work! - //pip->video->sprifilei = set_anim_by_id(player[pn].ent->spri, player[pn].enti.dire); if(pip->video->sprifilei == -1){ printf("ERROR! %u\n", player[pn].enti.dire); return; } + if(player[pn].enti.q==1) + set_anim_by_id(player[pn].ent->spri, player[pn].enti.dire); + //pip->video->sprifilei = set_anim_by_id(player[pn].ent->spri, player[pn].enti.dire); if(pip->video->sprifilei == -1){ printf("ERROR! %u\n", player[pn].enti.dire); return; } //setting xy position player[pn].ent->spri->x = x; @@ -1312,7 +1313,7 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr break; } pip->video->r=1; - WALKTYPE_FRAM_PRINT; + //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/vrstest.c b/src/vrstest.c index 707832a2..b814fe81 100755 --- a/src/vrstest.c +++ b/src/vrstest.c @@ -120,8 +120,13 @@ void main() /*modexLoadPalFile("data/spri/chikyuu.pal", &pal); modexPalUpdate1(pal);*/ VL_LoadPalFile("data/spri/chikyuu.pal", &palette); - for (i = 0; i < 5; i++){ + for (i = 0; i < 10; i++){ spri.delay = 1; + + if(i==5) set_anim_by_id(&spri, 21); + //else if(i>=10) set_anim_by_id(&spri, 31); + //else if(i<=15) set_anim_by_id(&spri, 41); + animate_spri(&spri, &gvar.video);// spri.x += 16; delay(500); }