From: sparky4 Date: Fri, 13 Jan 2017 15:44:19 +0000 (-0600) Subject: ==== MAJOR CHANGES ARE BEING MADE!! WWWW ==== X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=f608476e42e768303a7ce6efdf7f5192b477e8f7;p=16.git ==== MAJOR CHANGES ARE BEING MADE!! WWWW ==== --- diff --git a/DEBUG.16W b/DEBUG.16W index 6bab6d13..2e59990f 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,210 +1,210 @@ -Seg:0 Size:9962 Owner:0x0 +Seg:0 Size:9965 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0000 -Seg:27b3 Size:44 Owner:0x0 +Seg:27b5 Size:44 Owner:0x0 + -Seg:27df Size:256 Owner:0x1954 +Seg:27e1 Size:256 Owner:0x1964 ++++ -Seg:28df Size:256 Owner:0x1746 -++++ -Seg:29df Size:256 Owner:0x1748 +Seg:28e1 Size:256 Owner:0x1756 +++++ -Seg:2adf Size:256 Owner:0x174a +Seg:29e1 Size:256 Owner:0x1758 ++++ -Seg:2bdf Size:256 Owner:0x174c +Seg:2ae1 Size:256 Owner:0x175a ++++ -Seg:2cdf Size:256 Owner:0x174e +Seg:2be1 Size:256 Owner:0x175c ++++ -Seg:2ddf Size:256 Owner:0x1750 +Seg:2ce1 Size:256 Owner:0x175e ++++ -Seg:2edf Size:256 Owner:0x1752 +Seg:2de1 Size:256 Owner:0x1760 +++++ -Seg:2fdf Size:256 Owner:0x1754 +Seg:2ee1 Size:256 Owner:0x1762 ++++ -Seg:30df Size:256 Owner:0x1756 +Seg:2fe1 Size:256 Owner:0x1764 ++++ -Seg:31df Size:256 Owner:0x1758 +Seg:30e1 Size:256 Owner:0x1766 ++++ -Seg:32df Size:256 Owner:0x175a +Seg:31e1 Size:256 Owner:0x1768 ++++ -Seg:33df Size:256 Owner:0x175c +Seg:32e1 Size:256 Owner:0x176a +++++ -Seg:34df Size:256 Owner:0x175e +Seg:33e1 Size:256 Owner:0x176c ++++ -Seg:35df Size:256 Owner:0x1760 +Seg:34e1 Size:256 Owner:0x176e ++++ -Seg:36df Size:256 Owner:0x1762 +Seg:35e1 Size:256 Owner:0x1770 ++++ -Seg:37df Size:256 Owner:0x1764 +Seg:36e1 Size:256 Owner:0x1772 ++++ -Seg:38df Size:256 Owner:0x1766 +Seg:37e1 Size:256 Owner:0x1774 +++++ -Seg:39df Size:256 Owner:0x1768 +Seg:38e1 Size:256 Owner:0x1776 ++++ -Seg:3adf Size:256 Owner:0x176a +Seg:39e1 Size:256 Owner:0x1778 ++++ -Seg:3bdf Size:256 Owner:0x176c +Seg:3ae1 Size:256 Owner:0x177a ++++ -Seg:3cdf Size:256 Owner:0x176e +Seg:3be1 Size:256 Owner:0x177c ++++ -Seg:3ddf Size:256 Owner:0x1770 +Seg:3ce1 Size:256 Owner:0x177e +++++ -Seg:3edf Size:256 Owner:0x1772 +Seg:3de1 Size:256 Owner:0x1780 ++++ -Seg:3fdf Size:256 Owner:0x1774 +Seg:3ee1 Size:256 Owner:0x1782 ++++ -Seg:40df Size:256 Owner:0x1776 +Seg:3fe1 Size:256 Owner:0x1784 ++++ -Seg:41df Size:256 Owner:0x1778 +Seg:40e1 Size:256 Owner:0x1786 ++++ -Seg:42df Size:256 Owner:0x177a +Seg:41e1 Size:256 Owner:0x1788 +++++ -Seg:43df Size:256 Owner:0x177c +Seg:42e1 Size:256 Owner:0x178a ++++ -Seg:44df Size:256 Owner:0x177e +Seg:43e1 Size:256 Owner:0x178c ++++ -Seg:45df Size:256 Owner:0x1780 +Seg:44e1 Size:256 Owner:0x178e ++++ -Seg:46df Size:256 Owner:0x1782 +Seg:45e1 Size:256 Owner:0x1790 ++++ -Seg:47df Size:256 Owner:0x1784 +Seg:46e1 Size:256 Owner:0x1792 +++++ -Seg:48df Size:256 Owner:0x1786 +Seg:47e1 Size:256 Owner:0x1794 ++++ -Seg:49df Size:256 Owner:0x1788 +Seg:48e1 Size:256 Owner:0x1796 ++++ -Seg:4adf Size:256 Owner:0x178a +Seg:49e1 Size:256 Owner:0x1798 ++++ -Seg:4bdf Size:256 Owner:0x178c +Seg:4ae1 Size:256 Owner:0x179a ++++ -Seg:4cdf Size:256 Owner:0x178e +Seg:4be1 Size:256 Owner:0x179c +++++ -Seg:4ddf Size:256 Owner:0x1790 +Seg:4ce1 Size:256 Owner:0x179e ++++ -Seg:4edf Size:256 Owner:0x1792 +Seg:4de1 Size:256 Owner:0x17a0 ++++ -Seg:4fdf Size:256 Owner:0x1794 +Seg:4ee1 Size:256 Owner:0x17a2 ++++ -Seg:50df Size:256 Owner:0x1796 +Seg:4fe1 Size:256 Owner:0x17a4 ++++ -Seg:51df Size:256 Owner:0x1798 +Seg:50e1 Size:256 Owner:0x17a6 +++++ -Seg:52df Size:256 Owner:0x179a +Seg:51e1 Size:256 Owner:0x17a8 ++++ -Seg:53df Size:256 Owner:0x179c +Seg:52e1 Size:256 Owner:0x17aa ++++ -Seg:54df Size:256 Owner:0x179e +Seg:53e1 Size:256 Owner:0x17ac ++++ -Seg:55df Size:256 Owner:0x17a0 +Seg:54e1 Size:256 Owner:0x17ae ++++ -Seg:56df Size:256 Owner:0x17a2 +Seg:55e1 Size:256 Owner:0x17b0 +++++ -Seg:57df Size:256 Owner:0x17a4 +Seg:56e1 Size:256 Owner:0x17b2 ++++ -Seg:58df Size:256 Owner:0x17a6 +Seg:57e1 Size:256 Owner:0x17b4 ++++ -Seg:59df Size:256 Owner:0x17a8 +Seg:58e1 Size:256 Owner:0x17b6 ++++ -Seg:5adf Size:256 Owner:0x17aa +Seg:59e1 Size:256 Owner:0x17b8 ++++ -Seg:5bdf Size:256 Owner:0x17ac +Seg:5ae1 Size:256 Owner:0x17ba +++++ -Seg:5cdf Size:256 Owner:0x17ae +Seg:5be1 Size:256 Owner:0x17bc ++++ -Seg:5ddf Size:256 Owner:0x17b0 +Seg:5ce1 Size:256 Owner:0x17be ++++ -Seg:5edf Size:256 Owner:0x17b2 +Seg:5de1 Size:256 Owner:0x17c0 ++++ -Seg:5fdf Size:256 Owner:0x17b4 +Seg:5ee1 Size:256 Owner:0x17c2 ++++ -Seg:60df Size:256 Owner:0x17b6 +Seg:5fe1 Size:256 Owner:0x17c4 +++++ -Seg:61df Size:256 Owner:0x17b8 +Seg:60e1 Size:256 Owner:0x17c6 ++++ -Seg:62df Size:256 Owner:0x17ba +Seg:61e1 Size:256 Owner:0x17c8 ++++ -Seg:63df Size:256 Owner:0x17bc +Seg:62e1 Size:256 Owner:0x17ca ++++ -Seg:64df Size:256 Owner:0x17be +Seg:63e1 Size:256 Owner:0x17cc ++++ -Seg:65df Size:256 Owner:0x17c0 +Seg:64e1 Size:256 Owner:0x17ce +++++ -Seg:66df Size:256 Owner:0x17c2 +Seg:65e1 Size:256 Owner:0x17d0 ++++ -Seg:67df Size:256 Owner:0x17c4 +Seg:66e1 Size:256 Owner:0x17d2 ++++ -Seg:68df Size:256 Owner:0x17c6 +Seg:67e1 Size:256 Owner:0x17d4 ++++ -Seg:69df Size:256 Owner:0x17c8 +Seg:68e1 Size:256 Owner:0x17d6 ++++ -Seg:6adf Size:256 Owner:0x17ca +Seg:69e1 Size:256 Owner:0x17d8 +++++ -Seg:6bdf Size:256 Owner:0x17cc +Seg:6ae1 Size:256 Owner:0x17da ++++ -Seg:6cdf Size:256 Owner:0x17ce +Seg:6be1 Size:256 Owner:0x17dc ++++ -Seg:6ddf Size:256 Owner:0x17d0 +Seg:6ce1 Size:256 Owner:0x17de ++++ -Seg:6edf Size:256 Owner:0x17d2 +Seg:6de1 Size:256 Owner:0x17e0 ++++ -Seg:6fdf Size:256 Owner:0x17d4 +Seg:6ee1 Size:256 Owner:0x17e2 +++++ -Seg:70df Size:256 Owner:0x17d6 +Seg:6fe1 Size:256 Owner:0x17e4 ++++ -Seg:71df Size:256 Owner:0x17d8 +Seg:70e1 Size:256 Owner:0x17e6 ++++ -Seg:72df Size:256 Owner:0x17da +Seg:71e1 Size:256 Owner:0x17e8 ++++ -Seg:73df Size:256 Owner:0x17dc +Seg:72e1 Size:256 Owner:0x17ea ++++ -Seg:74df Size:256 Owner:0x17de +Seg:73e1 Size:256 Owner:0x17ec +++++ -Seg:75df Size:256 Owner:0x17e0 +Seg:74e1 Size:256 Owner:0x17ee ++++ -Seg:76df Size:256 Owner:0x17e2 +Seg:75e1 Size:256 Owner:0x17f0 ++++ -Seg:77df Size:256 Owner:0x17e4 +Seg:76e1 Size:256 Owner:0x17f2 ++++ -Seg:78df Size:256 Owner:0x17e6 +Seg:77e1 Size:256 Owner:0x17f4 ++++ -Seg:79df Size:256 Owner:0x17e8 +Seg:78e1 Size:256 Owner:0x17f6 +++++ -Seg:7adf Size:256 Owner:0x17ea +Seg:79e1 Size:256 Owner:0x17f8 ++++ -Seg:7bdf Size:256 Owner:0x17ec +Seg:7ae1 Size:256 Owner:0x17fa ++++ -Seg:7cdf Size:256 Owner:0x17ee +Seg:7be1 Size:256 Owner:0x17fc ++++ -Seg:7ddf Size:256 Owner:0x17f0 +Seg:7ce1 Size:256 Owner:0x17fe ++++ -Seg:7edf Size:256 Owner:0x17f2 +Seg:7de1 Size:256 Owner:0x1800 +++++ -Seg:7fdf Size:256 Owner:0x17f4 +Seg:7ee1 Size:256 Owner:0x1802 ++++ -Seg:80df Size:256 Owner:0x17f6 +Seg:7fe1 Size:256 Owner:0x1804 ++++ -Seg:81df Size:256 Owner:0x17f8 +Seg:80e1 Size:256 Owner:0x1806 ++++ -Seg:82df Size:256 Owner:0x17fa +Seg:81e1 Size:256 Owner:0x1808 ++++ -Seg:83df Size:256 Owner:0x17fc +Seg:82e1 Size:256 Owner:0x180a +++++ -Seg:84df Size:256 Owner:0x17fe +Seg:83e1 Size:256 Owner:0x180c ++++ -Seg:85df Size:256 Owner:0x1800 +Seg:84e1 Size:256 Owner:0x180e ++++ -Seg:86df Size:256 Owner:0x1802 +Seg:85e1 Size:256 Owner:0x1810 ++++ -Seg:87df Size:256 Owner:0x1804 +Seg:86e1 Size:256 Owner:0x1812 ++++ -Seg:88df Size:256 Owner:0x1806 +Seg:87e1 Size:256 Owner:0x1814 +++++ -Seg:89df Size:256 Owner:0x1808 +Seg:88e1 Size:256 Owner:0x1816 +++++ +Seg:89e1 Size:256 Owner:0x1818 ++++ -Seg:8adf Size:256 Owner:0x180a +Seg:8ae1 Size:256 Owner:0x181a ++++ -Seg:8bdf Size:256 Owner:0x180c +Seg:8be1 Size:256 Owner:0x181c ++++ -Seg:8cdf Size:401 Owner:0xef22 +Seg:8ce1 Size:401 Owner:0xef32 ++++++ -Seg:b7df Size:18464 Owner:0x0 +Seg:b7e1 Size:18462 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index c1fae019..7de92de0 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,69 +1,69 @@ == default == - USED block at 27d50016 of size 136 - FREE block at 27d5009e of size 68 - USED block at 27d500e2 of size 50 - USED block at 27d50114 of size 50 - USED block at 27d50146 of size 50 - USED block at 27d50178 of size 50 - USED block at 27d501aa of size 50 - USED block at 27d501dc of size 50 - USED block at 27d5020e of size 50 - USED block at 27d50240 of size 50 - USED block at 27d50272 of size 50 - USED block at 27d502a4 of size 50 - USED block at 27d502d6 of size 50 - USED block at 27d50308 of size 50 - FREE block at 27d5033a of size 14 - USED block at 27d50348 of size 20 - FREE block at 27d5035c of size 7328 + USED block at 27d70016 of size 136 + FREE block at 27d7009e of size 68 + USED block at 27d700e2 of size 50 + USED block at 27d70114 of size 50 + USED block at 27d70146 of size 50 + USED block at 27d70178 of size 50 + USED block at 27d701aa of size 50 + USED block at 27d701dc of size 50 + USED block at 27d7020e of size 50 + USED block at 27d70240 of size 50 + USED block at 27d70272 of size 50 + USED block at 27d702a4 of size 50 + USED block at 27d702d6 of size 50 + USED block at 27d70308 of size 50 + FREE block at 27d7033a of size 14 + USED block at 27d70348 of size 20 + FREE block at 27d7035c of size 7328 OK - end of heap == near == - USED block at 17d4ef66 of size 12 - USED block at 17d4ef72 of size 330 - USED block at 17d4f0bc of size 52 - USED block at 17d4f0f0 of size 20 - USED block at 17d4f104 of size 20 - USED block at 17d4f118 of size 20 - USED block at 17d4f12c of size 20 - USED block at 17d4f140 of size 20 - USED block at 17d4f154 of size 3752 + USED block at 17d6ef76 of size 12 + USED block at 17d6ef82 of size 330 + USED block at 17d6f0cc of size 52 + USED block at 17d6f100 of size 20 + USED block at 17d6f114 of size 20 + USED block at 17d6f128 of size 20 + USED block at 17d6f13c of size 20 + USED block at 17d6f150 of size 20 + USED block at 17d6f164 of size 3736 OK - end of heap == far == - USED block at 27d50016 of size 136 - USED block at 27d5009e of size 68 - USED block at 27d500e2 of size 50 - USED block at 27d50114 of size 50 - USED block at 27d50146 of size 50 - USED block at 27d50178 of size 50 - USED block at 27d501aa of size 50 - USED block at 27d501dc of size 50 - USED block at 27d5020e of size 50 - USED block at 27d50240 of size 50 - USED block at 27d50272 of size 50 - USED block at 27d502a4 of size 50 - USED block at 27d502d6 of size 50 - USED block at 27d50308 of size 50 - USED block at 27d5033a of size 14 - USED block at 27d50348 of size 20 - USED block at 27d5035c of size 7328 + USED block at 27d70016 of size 136 + USED block at 27d7009e of size 68 + USED block at 27d700e2 of size 50 + USED block at 27d70114 of size 50 + USED block at 27d70146 of size 50 + USED block at 27d70178 of size 50 + USED block at 27d701aa of size 50 + USED block at 27d701dc of size 50 + USED block at 27d7020e of size 50 + USED block at 27d70240 of size 50 + USED block at 27d70272 of size 50 + USED block at 27d702a4 of size 50 + USED block at 27d702d6 of size 50 + USED block at 27d70308 of size 50 + USED block at 27d7033a of size 14 + USED block at 27d70348 of size 20 + USED block at 27d7035c of size 7328 OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- Default 8166 756 7410 -Near 4246 494 3752 +Near 4230 494 3736 Far 8166 756 7410 ---------------- -------- -------- -------- -coreleft = 3750 -farcoreleft = 35566 +coreleft = 3734 +farcoreleft = 35550 GetFreeSize = 31836 -GetNearFreeSize = 3752 +GetNearFreeSize = 3736 GetFarFreeSize = 31836 -memavl = 3750 +memavl = 3734 stackavail = 31545 diff --git a/MMDUMP.16W b/MMDUMP.16W index dabc7f6f..c09f9c3d 100755 Binary files a/MMDUMP.16W and b/MMDUMP.16W differ diff --git a/src/lib/16_dbg.c b/src/lib/16_dbg.c index 7ba768df..634003a6 100755 --- a/src/lib/16_dbg.c +++ b/src/lib/16_dbg.c @@ -5,7 +5,7 @@ boolean dbg_debugpm=0; #endif #ifdef __DEBUG_InputMgr__ -boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0,dbg_notest=0; +boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0,dbg_nointest=0; #endif #ifdef __DEBUG_MAP__ boolean dbg_maptext=0; diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h index 823e7272..1abc2bce 100755 --- a/src/lib/16_dbg.h +++ b/src/lib/16_dbg.h @@ -17,7 +17,7 @@ extern boolean dbg_debugpm; #endif #ifdef __DEBUG_InputMgr__ -extern boolean dbg_testkeyin,dbg_testcontrolnoisy,dbg_notest; +extern boolean dbg_testkeyin,dbg_testcontrolnoisy,dbg_nointest; #endif #ifdef __DEBUG_MAP__ extern boolean dbg_maptext; diff --git a/src/lib/16_in.c b/src/lib/16_in.c index 2e54a627..e3587bf7 100755 --- a/src/lib/16_in.c +++ b/src/lib/16_in.c @@ -1248,12 +1248,12 @@ IN_UserInput(dword delay,boolean clear) boolean IN_KeyDown(byte code) { #ifdef __DEBUG_InputMgr__ - if(!dbg_notest) + if(!dbg_nointest) #endif return inpu.Keyboard[code]; #ifdef __DEBUG_InputMgr__ else - if(dbg_notest && kbhit()) + if(dbg_nointest && kbhit()) return 1; else return 0; diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c index d7a86f56..675c8680 100755 --- a/src/lib/16_tail.c +++ b/src/lib/16_tail.c @@ -77,7 +77,7 @@ void Startup16(global_game_variables_t *gvar) MM_Startup(gvar); #ifdef __WATCOMC__ #ifdef __DEBUG_InputMgr__ - if(!dbg_notest) + if(!dbg_nointest) #endif IN_Startup(gvar); #endif @@ -103,7 +103,7 @@ void Shutdown16(global_game_variables_t *gvar) PM_Shutdown(gvar); #ifdef __WATCOMC__ #ifdef __DEBUG_InputMgr__ - if(!dbg_notest) + if(!dbg_nointest) #endif IN_Shutdown(gvar); #endif diff --git a/src/vrstest.c b/src/vrstest.c index b5642de0..79338763 100755 --- a/src/vrstest.c +++ b/src/vrstest.c @@ -28,7 +28,7 @@ #include "src/lib/16_ca.h" #include "src/lib/16_mm.h" -extern boolean dbg_notest; +extern boolean dbg_nointest; static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */ static byte palette[768]; @@ -51,15 +51,12 @@ void main() uint32_t vrl_size; int num_of_vrl; struct vrl1_vgax_header far *curr_vrl; - byte *pal=0; int size=0; - word w=0; - dbg_notest=0; + dbg_nointest=0; Startup16(&gvar); // What should be done by read_vrs: - VL_LoadPalFile("data/spri/chikyuu.pal", &palette); CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar);//) baka=1; else baka=0; // Insert sanity cheks later @@ -124,6 +121,7 @@ void main() modexPalUpdate1(pal);*/ for (i = 0; i < 5; i++){ spri.delay = 1; animate_spri(&spri, &gvar); spri.x += 20; /*sleep(1);*/ } + VL_LoadPalFile("data/spri/chikyuu.pal", &palette); while(!IN_KeyDown(sc_Escape)) { @@ -136,6 +134,7 @@ void main() w++; break; }*/ + if(IN_KeyDown(24)){ modexpdump(&gvar.video.page[0]); IN_UserInput(1,1); } //p FUNCTIONKEYFUNCTIONS; } VGAmodeX(0, 1, &gvar);