From: sparky4 Date: Mon, 23 Jan 2017 17:11:06 +0000 (-0600) Subject: dang it./wbuild.sh vga_state.vga_graphics_ram = video->omemptr; causes it to not... X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=037a7a75c9fae0c1e1fe4583a87583394937915e;p=16.git dang it./wbuild.sh vga_state.vga_graphics_ram = video->omemptr; causes it to not have sprite in right spot! itis disabled wwww this is hard just to get it right wwww crap./wbuild.sh fackn hard! wwww --- diff --git a/DEBUG.16W b/DEBUG.16W new file mode 100755 index 00000000..2d5543e2 --- /dev/null +++ b/DEBUG.16W @@ -0,0 +1,210 @@ +Seg:0 Size:9861 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++000 +Seg:274c Size:44 Owner:0x0 +++ +Seg:2778 Size:256 Owner:0x1970 +++++ +Seg:2878 Size:256 Owner:0x1762 +++++ +Seg:2978 Size:256 Owner:0x1764 +++++ +Seg:2a78 Size:256 Owner:0x1766 ++++++ +Seg:2b78 Size:256 Owner:0x1768 +++++ +Seg:2c78 Size:256 Owner:0x176a +++++ +Seg:2d78 Size:256 Owner:0x176c +++++ +Seg:2e78 Size:256 Owner:0x176e +++++ +Seg:2f78 Size:256 Owner:0x1770 ++++++ +Seg:3078 Size:256 Owner:0x1772 +++++ +Seg:3178 Size:256 Owner:0x1774 +++++ +Seg:3278 Size:256 Owner:0x1776 +++++ +Seg:3378 Size:256 Owner:0x1778 +++++ +Seg:3478 Size:256 Owner:0x177a ++++++ +Seg:3578 Size:256 Owner:0x177c +++++ +Seg:3678 Size:256 Owner:0x177e +++++ +Seg:3778 Size:256 Owner:0x1780 +++++ +Seg:3878 Size:256 Owner:0x1782 +++++ +Seg:3978 Size:256 Owner:0x1784 ++++++ +Seg:3a78 Size:256 Owner:0x1786 +++++ +Seg:3b78 Size:256 Owner:0x1788 +++++ +Seg:3c78 Size:256 Owner:0x178a +++++ +Seg:3d78 Size:256 Owner:0x178c +++++ +Seg:3e78 Size:256 Owner:0x178e ++++++ +Seg:3f78 Size:256 Owner:0x1790 +++++ +Seg:4078 Size:256 Owner:0x1792 +++++ +Seg:4178 Size:256 Owner:0x1794 +++++ +Seg:4278 Size:256 Owner:0x1796 +++++ +Seg:4378 Size:256 Owner:0x1798 ++++++ +Seg:4478 Size:256 Owner:0x179a +++++ +Seg:4578 Size:256 Owner:0x179c +++++ +Seg:4678 Size:256 Owner:0x179e +++++ +Seg:4778 Size:256 Owner:0x17a0 +++++ +Seg:4878 Size:256 Owner:0x17a2 ++++++ +Seg:4978 Size:256 Owner:0x17a4 +++++ +Seg:4a78 Size:256 Owner:0x17a6 +++++ +Seg:4b78 Size:256 Owner:0x17a8 +++++ +Seg:4c78 Size:256 Owner:0x17aa +++++ +Seg:4d78 Size:256 Owner:0x17ac ++++++ +Seg:4e78 Size:256 Owner:0x17ae +++++ +Seg:4f78 Size:256 Owner:0x17b0 +++++ +Seg:5078 Size:256 Owner:0x17b2 +++++ +Seg:5178 Size:256 Owner:0x17b4 +++++ +Seg:5278 Size:256 Owner:0x17b6 ++++++ +Seg:5378 Size:256 Owner:0x17b8 +++++ +Seg:5478 Size:256 Owner:0x17ba +++++ +Seg:5578 Size:256 Owner:0x17bc +++++ +Seg:5678 Size:256 Owner:0x17be +++++ +Seg:5778 Size:256 Owner:0x17c0 ++++++ +Seg:5878 Size:256 Owner:0x17c2 +++++ +Seg:5978 Size:256 Owner:0x17c4 +++++ +Seg:5a78 Size:256 Owner:0x17c6 +++++ +Seg:5b78 Size:256 Owner:0x17c8 +++++ +Seg:5c78 Size:256 Owner:0x17ca ++++++ +Seg:5d78 Size:256 Owner:0x17cc +++++ +Seg:5e78 Size:256 Owner:0x17ce +++++ +Seg:5f78 Size:256 Owner:0x17d0 +++++ +Seg:6078 Size:256 Owner:0x17d2 +++++ +Seg:6178 Size:256 Owner:0x17d4 ++++++ +Seg:6278 Size:256 Owner:0x17d6 +++++ +Seg:6378 Size:256 Owner:0x17d8 +++++ +Seg:6478 Size:256 Owner:0x17da +++++ +Seg:6578 Size:256 Owner:0x17dc +++++ +Seg:6678 Size:256 Owner:0x17de ++++++ +Seg:6778 Size:256 Owner:0x17e0 +++++ +Seg:6878 Size:256 Owner:0x17e2 +++++ +Seg:6978 Size:256 Owner:0x17e4 +++++ +Seg:6a78 Size:256 Owner:0x17e6 +++++ +Seg:6b78 Size:256 Owner:0x17e8 ++++++ +Seg:6c78 Size:256 Owner:0x17ea +++++ +Seg:6d78 Size:256 Owner:0x17ec +++++ +Seg:6e78 Size:256 Owner:0x17ee +++++ +Seg:6f78 Size:256 Owner:0x17f0 +++++ +Seg:7078 Size:256 Owner:0x17f2 ++++++ +Seg:7178 Size:256 Owner:0x17f4 +++++ +Seg:7278 Size:256 Owner:0x17f6 +++++ +Seg:7378 Size:256 Owner:0x17f8 +++++ +Seg:7478 Size:256 Owner:0x17fa +++++ +Seg:7578 Size:256 Owner:0x17fc ++++++ +Seg:7678 Size:256 Owner:0x17fe +++++ +Seg:7778 Size:256 Owner:0x1800 +++++ +Seg:7878 Size:256 Owner:0x1802 +++++ +Seg:7978 Size:256 Owner:0x1804 +++++ +Seg:7a78 Size:256 Owner:0x1806 ++++++ +Seg:7b78 Size:256 Owner:0x1808 +++++ +Seg:7c78 Size:256 Owner:0x180a +++++ +Seg:7d78 Size:256 Owner:0x180c +++++ +Seg:7e78 Size:256 Owner:0x180e +++++ +Seg:7f78 Size:256 Owner:0x1810 ++++++ +Seg:8078 Size:256 Owner:0x1812 +++++ +Seg:8178 Size:256 Owner:0x1814 +++++ +Seg:8278 Size:256 Owner:0x1816 +++++ +Seg:8378 Size:256 Owner:0x1818 +++++ +Seg:8478 Size:256 Owner:0x181a ++++++ +Seg:8578 Size:256 Owner:0x181c +++++ +Seg:8678 Size:256 Owner:0x181e +++++ +Seg:8778 Size:256 Owner:0x1820 +++++ +Seg:8878 Size:256 Owner:0x1822 +++++ +Seg:8978 Size:256 Owner:0x1824 ++++++ +Seg:8a78 Size:256 Owner:0x1826 +++++ +Seg:8b78 Size:256 Owner:0x1828 +++++ +Seg:8c78 Size:401 Owner:0xef42 +++++++ +Seg:b778 Size:18567 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W new file mode 100755 index 00000000..47db1fc9 --- /dev/null +++ b/HEAP.16W @@ -0,0 +1,69 @@ + + == default == + + USED block at 276e0016 of size 136 + FREE block at 276e009e of size 68 + USED block at 276e00e2 of size 50 + USED block at 276e0114 of size 50 + USED block at 276e0146 of size 50 + USED block at 276e0178 of size 50 + USED block at 276e01aa of size 50 + USED block at 276e01dc of size 50 + USED block at 276e020e of size 50 + USED block at 276e0240 of size 50 + USED block at 276e0272 of size 50 + USED block at 276e02a4 of size 50 + USED block at 276e02d6 of size 50 + USED block at 276e0308 of size 50 + FREE block at 276e033a of size 14 + USED block at 276e0348 of size 20 + FREE block at 276e035c of size 7328 +OK - end of heap + + == near == + + USED block at 176def86 of size 12 + USED block at 176def92 of size 330 + USED block at 176df0dc of size 52 + USED block at 176df110 of size 20 + USED block at 176df124 of size 20 + USED block at 176df138 of size 20 + USED block at 176df14c of size 20 + USED block at 176df160 of size 20 + USED block at 176df174 of size 3720 +OK - end of heap + + == far == + + USED block at 276e0016 of size 136 + USED block at 276e009e of size 68 + USED block at 276e00e2 of size 50 + USED block at 276e0114 of size 50 + USED block at 276e0146 of size 50 + USED block at 276e0178 of size 50 + USED block at 276e01aa of size 50 + USED block at 276e01dc of size 50 + USED block at 276e020e of size 50 + USED block at 276e0240 of size 50 + USED block at 276e0272 of size 50 + USED block at 276e02a4 of size 50 + USED block at 276e02d6 of size 50 + USED block at 276e0308 of size 50 + USED block at 276e033a of size 14 + USED block at 276e0348 of size 20 + USED block at 276e035c 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..b025a313 Binary files /dev/null and b/MMDUMP.16W differ diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h index 9af21bc5..84364bac 100755 --- a/src/lib/16_tail.h +++ b/src/lib/16_tail.h @@ -41,7 +41,7 @@ break;\ case 2:\ gvar.video.rs=0;\ - break; }\ + break;}\ IN_UserInput(1,1); } #define FUNCTIONKEYFUNCTIONS0EXE \ if(IN_KeyDown(sc_F6)){ VL_ShowPage(&gvar.video.page[gvar.video.panp], 0, 0); IN_UserInput(1,1); } \ diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h index e2b2161d..7583be8c 100755 --- a/src/lib/16_tdef.h +++ b/src/lib/16_tdef.h @@ -266,7 +266,7 @@ typedef struct byte vga_draw_stride_limit; // further X clipping // word __near rs; //render switch - int __near playerfilei; //player file's i + int __near sprifilei; //player file's i boolean __near p; //render page number //BLEH boolean __near r; //page flip if true word pr[MAXPAGE][4]; //render sections of pages (this is supposed to be set up to draw sections of the screen if updated) diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index e9d05c78..8a59918a 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -24,7 +24,6 @@ */ #include "src/lib/scroll16.h" -#define ANIMATESPRIFUN ZC_animatePlayer #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); @@ -195,6 +194,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn) player[pn].enti.triggery = player[pn].enti.ty-1; break; } + if(player[pn].enti.d!=2 && pip[0].video->rs) delay(500); } @@ -1105,7 +1105,7 @@ 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 dire, word sw) { - pip->video->playerfilei=0; + pip->video->sprifilei=0; switch(sw) { @@ -1126,11 +1126,11 @@ void near ZC_drawframe(map_view_t *pip, player_t *player, word pn, sword x, swor switch(pip[0].video->rs) { case 0: - pip->video->playerfilei = set_anim_by_id(player[pn].ent->spri, dire); if(pip->video->playerfilei == -1) return; + pip->video->sprifilei = set_anim_by_id(player[pn].ent->spri, dire); if(pip->video->sprifilei == -1) return; animate_spri(player[pn].ent->spri, pip->video); break; case 1: - pip->video->playerfilei = set_anim_by_id(player[pn].ent->spri, dire); if(pip->video->playerfilei == -1) return; + pip->video->sprifilei = set_anim_by_id(player[pn].ent->spri, dire); if(pip->video->sprifilei == -1) return; oldanimate_spri(player[pn].ent->spri, pip->video); break; case 2: @@ -1294,11 +1294,6 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn, sword scr player[pn].ent->spri->x = x; player[pn].ent->spri->y = y; -//#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 2+dire); -//#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire); -//#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, dire); -//#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire); - switch(ls) { case 1: diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h index 3d965c90..873197bc 100755 --- a/src/lib/scroll16.h +++ b/src/lib/scroll16.h @@ -44,10 +44,7 @@ #define SPRITE //#define TILERENDER -//modexDrawSpritePBufRegion -//modexDrawBmpPBufRegion -//#define PBUFSFUN modexDrawSpriteRegion -//#define PBUFBFUN modexDrawBmpRegion +#define ANIMATESPRIFUN ZC_animatePlayer #define PLAYERBMPDATAVAR player[pn].data #define PLAYERBMPDATA *PLAYERBMPDATAVAR @@ -261,3 +258,8 @@ void near mapScroll(map_view_t *mv, player_t *player); } pip->video->r=1; }*/ + +//modexDrawSpritePBufRegion +//modexDrawBmpPBufRegion +//#define PBUFSFUN modexDrawSpriteRegion +//#define PBUFBFUN modexDrawBmpRegion diff --git a/src/vrstest.c b/src/vrstest.c index f94f4c0f..094f4a9f 100755 --- a/src/vrstest.c +++ b/src/vrstest.c @@ -122,7 +122,7 @@ void main() VL_LoadPalFile("data/spri/chikyuu.pal", &palette); for (i = 0; i < 5; i++){ spri.delay = 1; animate_spri(&spri, &gvar.video);// spri.x += 16; - sleep(1); + delay(500); } while(!IN_KeyDown(sc_Escape)) diff --git a/src/zcroll.c b/src/zcroll.c index 9e3c0b58..789a8eb3 100755 --- a/src/zcroll.c +++ b/src/zcroll.c @@ -102,7 +102,7 @@ void main(int argc, char *argv[]) ZC_MVSetup(&mv, &map, &gvar); //renderswitch - gvar.video.rs=0; + gvar.video.rs=1; //player[0].ent->spri->x = player[0].ent->spri->y = TILEWH; // set up paging