From: sparky4 Date: Thu, 26 Jan 2017 01:01:33 +0000 (-0600) Subject: ==== animation fram walk ==== i polished the shit out of it and it works MUCH better... X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=27159fe50f32964f4ab1c619c3fe2be021cd86a2 ==== animation fram walk ==== i polished the shit out of it and it works MUCH better now!! --- diff --git a/DEBUG.16W b/DEBUG.16W new file mode 100755 index 00000000..061cbf77 --- /dev/null +++ b/DEBUG.16W @@ -0,0 +1,210 @@ +Seg:0 Size:9956 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++000 +Seg:27ab Size:44 Owner:0x0 +++ +Seg:27d7 Size:256 Owner:0x1974 +++++ +Seg:28d7 Size:256 Owner:0x1766 +++++ +Seg:29d7 Size:256 Owner:0x1768 ++++++ +Seg:2ad7 Size:256 Owner:0x176a +++++ +Seg:2bd7 Size:256 Owner:0x176c +++++ +Seg:2cd7 Size:256 Owner:0x176e +++++ +Seg:2dd7 Size:256 Owner:0x1770 +++++ +Seg:2ed7 Size:256 Owner:0x1772 ++++++ +Seg:2fd7 Size:256 Owner:0x1774 +++++ +Seg:30d7 Size:256 Owner:0x1776 +++++ +Seg:31d7 Size:256 Owner:0x1778 +++++ +Seg:32d7 Size:256 Owner:0x177a +++++ +Seg:33d7 Size:256 Owner:0x177c ++++++ +Seg:34d7 Size:256 Owner:0x177e +++++ +Seg:35d7 Size:256 Owner:0x1780 +++++ +Seg:36d7 Size:256 Owner:0x1782 +++++ +Seg:37d7 Size:256 Owner:0x1784 +++++ +Seg:38d7 Size:256 Owner:0x1786 ++++++ +Seg:39d7 Size:256 Owner:0x1788 +++++ +Seg:3ad7 Size:256 Owner:0x178a +++++ +Seg:3bd7 Size:256 Owner:0x178c +++++ +Seg:3cd7 Size:256 Owner:0x178e +++++ +Seg:3dd7 Size:256 Owner:0x1790 ++++++ +Seg:3ed7 Size:256 Owner:0x1792 +++++ +Seg:3fd7 Size:256 Owner:0x1794 +++++ +Seg:40d7 Size:256 Owner:0x1796 +++++ +Seg:41d7 Size:256 Owner:0x1798 +++++ +Seg:42d7 Size:256 Owner:0x179a ++++++ +Seg:43d7 Size:256 Owner:0x179c +++++ +Seg:44d7 Size:256 Owner:0x179e +++++ +Seg:45d7 Size:256 Owner:0x17a0 +++++ +Seg:46d7 Size:256 Owner:0x17a2 +++++ +Seg:47d7 Size:256 Owner:0x17a4 ++++++ +Seg:48d7 Size:256 Owner:0x17a6 +++++ +Seg:49d7 Size:256 Owner:0x17a8 +++++ +Seg:4ad7 Size:256 Owner:0x17aa +++++ +Seg:4bd7 Size:256 Owner:0x17ac +++++ +Seg:4cd7 Size:256 Owner:0x17ae ++++++ +Seg:4dd7 Size:256 Owner:0x17b0 +++++ +Seg:4ed7 Size:256 Owner:0x17b2 +++++ +Seg:4fd7 Size:256 Owner:0x17b4 +++++ +Seg:50d7 Size:256 Owner:0x17b6 +++++ +Seg:51d7 Size:256 Owner:0x17b8 ++++++ +Seg:52d7 Size:256 Owner:0x17ba +++++ +Seg:53d7 Size:256 Owner:0x17bc +++++ +Seg:54d7 Size:256 Owner:0x17be +++++ +Seg:55d7 Size:256 Owner:0x17c0 +++++ +Seg:56d7 Size:256 Owner:0x17c2 ++++++ +Seg:57d7 Size:256 Owner:0x17c4 +++++ +Seg:58d7 Size:256 Owner:0x17c6 +++++ +Seg:59d7 Size:256 Owner:0x17c8 +++++ +Seg:5ad7 Size:256 Owner:0x17ca +++++ +Seg:5bd7 Size:256 Owner:0x17cc ++++++ +Seg:5cd7 Size:256 Owner:0x17ce +++++ +Seg:5dd7 Size:256 Owner:0x17d0 +++++ +Seg:5ed7 Size:256 Owner:0x17d2 +++++ +Seg:5fd7 Size:256 Owner:0x17d4 +++++ +Seg:60d7 Size:256 Owner:0x17d6 ++++++ +Seg:61d7 Size:256 Owner:0x17d8 +++++ +Seg:62d7 Size:256 Owner:0x17da +++++ +Seg:63d7 Size:256 Owner:0x17dc +++++ +Seg:64d7 Size:256 Owner:0x17de +++++ +Seg:65d7 Size:256 Owner:0x17e0 ++++++ +Seg:66d7 Size:256 Owner:0x17e2 +++++ +Seg:67d7 Size:256 Owner:0x17e4 +++++ +Seg:68d7 Size:256 Owner:0x17e6 +++++ +Seg:69d7 Size:256 Owner:0x17e8 +++++ +Seg:6ad7 Size:256 Owner:0x17ea ++++++ +Seg:6bd7 Size:256 Owner:0x17ec +++++ +Seg:6cd7 Size:256 Owner:0x17ee +++++ +Seg:6dd7 Size:256 Owner:0x17f0 +++++ +Seg:6ed7 Size:256 Owner:0x17f2 +++++ +Seg:6fd7 Size:256 Owner:0x17f4 ++++++ +Seg:70d7 Size:256 Owner:0x17f6 +++++ +Seg:71d7 Size:256 Owner:0x17f8 +++++ +Seg:72d7 Size:256 Owner:0x17fa +++++ +Seg:73d7 Size:256 Owner:0x17fc +++++ +Seg:74d7 Size:256 Owner:0x17fe ++++++ +Seg:75d7 Size:256 Owner:0x1800 +++++ +Seg:76d7 Size:256 Owner:0x1802 +++++ +Seg:77d7 Size:256 Owner:0x1804 +++++ +Seg:78d7 Size:256 Owner:0x1806 +++++ +Seg:79d7 Size:256 Owner:0x1808 ++++++ +Seg:7ad7 Size:256 Owner:0x180a +++++ +Seg:7bd7 Size:256 Owner:0x180c +++++ +Seg:7cd7 Size:256 Owner:0x180e +++++ +Seg:7dd7 Size:256 Owner:0x1810 +++++ +Seg:7ed7 Size:256 Owner:0x1812 ++++++ +Seg:7fd7 Size:256 Owner:0x1814 +++++ +Seg:80d7 Size:256 Owner:0x1816 +++++ +Seg:81d7 Size:256 Owner:0x1818 +++++ +Seg:82d7 Size:256 Owner:0x181a +++++ +Seg:83d7 Size:256 Owner:0x181c ++++++ +Seg:84d7 Size:256 Owner:0x181e +++++ +Seg:85d7 Size:256 Owner:0x1820 +++++ +Seg:86d7 Size:256 Owner:0x1822 +++++ +Seg:87d7 Size:256 Owner:0x1824 +++++ +Seg:88d7 Size:256 Owner:0x1826 ++++++ +Seg:89d7 Size:256 Owner:0x1828 +++++ +Seg:8ad7 Size:256 Owner:0x182a +++++ +Seg:8bd7 Size:256 Owner:0x182c +++++ +Seg:8cd7 Size:401 Owner:0xef40 +++++++ +Seg:b7d7 Size:18472 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W new file mode 100755 index 00000000..62e678d3 --- /dev/null +++ b/HEAP.16W @@ -0,0 +1,69 @@ + + == default == + + USED block at 27cd0016 of size 136 + FREE block at 27cd009e of size 68 + USED block at 27cd00e2 of size 50 + USED block at 27cd0114 of size 50 + USED block at 27cd0146 of size 50 + USED block at 27cd0178 of size 50 + USED block at 27cd01aa of size 50 + USED block at 27cd01dc of size 50 + USED block at 27cd020e of size 50 + USED block at 27cd0240 of size 50 + USED block at 27cd0272 of size 50 + USED block at 27cd02a4 of size 50 + USED block at 27cd02d6 of size 50 + USED block at 27cd0308 of size 50 + FREE block at 27cd033a of size 14 + USED block at 27cd0348 of size 20 + FREE block at 27cd035c of size 7328 +OK - end of heap + + == near == + + USED block at 17ccef86 of size 12 + USED block at 17ccef92 of size 330 + USED block at 17ccf0dc of size 52 + USED block at 17ccf110 of size 20 + USED block at 17ccf124 of size 20 + USED block at 17ccf138 of size 20 + USED block at 17ccf14c of size 20 + USED block at 17ccf160 of size 20 + USED block at 17ccf174 of size 3720 +OK - end of heap + + == far == + + USED block at 27cd0016 of size 136 + USED block at 27cd009e of size 68 + USED block at 27cd00e2 of size 50 + USED block at 27cd0114 of size 50 + USED block at 27cd0146 of size 50 + USED block at 27cd0178 of size 50 + USED block at 27cd01aa of size 50 + USED block at 27cd01dc of size 50 + USED block at 27cd020e of size 50 + USED block at 27cd0240 of size 50 + USED block at 27cd0272 of size 50 + USED block at 27cd02a4 of size 50 + USED block at 27cd02d6 of size 50 + USED block at 27cd0308 of size 50 + USED block at 27cd033a of size 14 + USED block at 27cd0348 of size 20 + USED block at 27cd035c 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 = 31527 diff --git a/MMDUMP.16W b/MMDUMP.16W new file mode 100755 index 00000000..d9442792 Binary files /dev/null and b/MMDUMP.16W differ diff --git a/makefile b/makefile index 2f6803af..621a7a6d 100755 --- a/makefile +++ b/makefile @@ -107,7 +107,7 @@ UPXQ=-qqq S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768 Z_FLAGS=-zk0 -zc -zp8 -zm O_FLAGS=-opmilr -oe=24 -outback -ei -ohnl+ -zp4 -T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -e28#65536##-fo=.$(OBJ) +T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1##-fo=.$(OBJ) -e=65536 DBUGFLAGS=-fm=$^&.mah -fd=$^& CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 @@ -185,14 +185,14 @@ TESTEXEC = & scroll.exe & zcroll.exe & inputest.exe & - pcxtest.exe + pcxtest.exe & + vrstest.exe TESTEXEC2 = & maptest.exe & fmemtest.exe & fonttest.exe & fontgfx.exe & test0.exe & - vrstest.exe & $(EXTERNTESTEXEC) TESTEXEC3= & pcxtest2.exe diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h index 6f10530b..f5998339 100755 --- a/src/lib/16_tail.h +++ b/src/lib/16_tail.h @@ -60,7 +60,9 @@ if(IN_KeyDown(2+1)){ gvar.video.panp=1; ZC_ShowMV(&mv, 0, 0); } \ if(IN_KeyDown(3+1)){ gvar.video.panp=2; ZC_ShowMV(&mv, 0, 1); } \ if(IN_KeyDown(4+1)){ gvar.video.panp=3; ZC_ShowMV(&mv, 0, 1); } \ -\ + FUNCTIONKEYDRAWJUNKNOMV + +#define FUNCTIONKEYDRAWJUNKNOMV \ if(IN_KeyDown(sc_A)) modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 3); \ if(IN_KeyDown(sc_S)) modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 4); \ \ diff --git a/src/vrstest.c b/src/vrstest.c index fbc111df..18353afb 100755 --- a/src/vrstest.c +++ b/src/vrstest.c @@ -32,7 +32,6 @@ extern boolean dbg_nointest; boolean panswitch; static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */ -static byte palette[768]; void main() { @@ -40,7 +39,7 @@ void main() //__segment sega; memptr bigbuffer; int i; - word start; + word start,w; float t1, t2; //boolean baka; entity_t enti; @@ -58,7 +57,7 @@ void main() Startup16(&gvar); // What should be done by read_vrs: - CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar);//) baka=1; else baka=0; + CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar); // Insert sanity cheks later vrs.buffer = bigbuffer; @@ -90,13 +89,15 @@ void main() vrs.vrl_line_offsets = vrl_line_offsets; - //read_vrs(&gvar, "data/spri/chikyuu.vrs", &vrs); +// read_vrs(&gvar, "data/spri/chikyuu.vrs", &vrs); + + enti.spri->spritesheet = &vrs; enti.spri->sprite_vrl_cont = malloc(sizeof(struct vrl_container)); i = set_anim_by_id((enti.spri), 31); if (i == -1) { - printf("glitch!\n"); + //Quit(&gvar, "ERROR!! glitch IN FILE!\n"); } enti.spri->x = TILEWH-4; enti.spri->y = TILEWH; @@ -107,11 +108,11 @@ void main() VGAmodeX(1, 1, &gvar); modexHiganbanaPageSetup(&gvar.video); - VL_ShowPage(&gvar.video.page[0], 0, 0); + VL_ShowPage(&gvar.video.page[0], 1, 0); /* non sprite comparison */ start = *clockw; - modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240); + //modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240); t1 = (*clockw-start) /18.2; start = *clockw; @@ -120,7 +121,8 @@ void main() /*modexLoadPalFile("data/spri/chikyuu.pal", &pal); modexPalUpdate1(pal);*/ - VL_LoadPalFile("data/spri/chikyuu.pal", &palette); + //modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 2); + VL_LoadPalFile("data/spri/chikyuu.pal", &gvar.video.palette); for (i = 0; i < 10; i++){ enti.spri->delay = 1; @@ -132,17 +134,20 @@ void main() while(!IN_KeyDown(sc_Escape)) { - /*switch(w) + switch(w) { - case 1024: - modexPalUpdate0(pal); + case 768: +// modexPalUpdate0(pal); w=0; default: w++; +// gvar.video.palette[w]=rand(); break; - }*/ + } + FUNCTIONKEYDRAWJUNKNOMV + if(IN_KeyDown(sc_F7)){ VL_ShowPage(&gvar.video.page[0], 1, 1); IN_UserInput(1,1); } + if(IN_KeyDown(sc_F6)){ VL_ShowPage(&gvar.video.page[0], 1, 0); IN_UserInput(1,1); } if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[0]); IN_UserInput(1,1); } //p -//FUNCTIONKEYFUNCTIONS; } VGAmodeX(0, 1, &gvar); MM_ShowMemory(&gvar);