From 9bd21c99a2f931fdae7fd1e9e4b17ae1c950ffa2 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Thu, 8 Sep 2016 11:22:25 -0500 Subject: [PATCH] bloody typedefstruct merging is going to be tricky --- DEBUG.16W | 21 +++++++++++-------- HEAP.16W | 54 ++++++++++++++++++++++++------------------------ MMDUMP.16W | Bin 66 -> 66 bytes src/lib/16_ca.c | 2 +- 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/DEBUG.16W b/DEBUG.16W index 2d02a399..1fcbed9d 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,14 +1,17 @@ -Seg:0 Size:11821 Owner:0x6 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ +Seg:0 Size:7817 Owner:0x16bb +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ 0 -Seg:2e2d Size:256 Owner:0x527a +Seg:1e89 Size:256 Owner:0x527a ++++_  -Seg:2f2d Size:273 Owner:0x92d2 +Seg:1f89 Size:273 Owner:0x92d2 +++++_  -Seg:3499 Size:40 Owner:0x0 -+_ -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Seg:c4c1 Size:15166 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ \ No newline at end of file +Seg:2518 Size:40 Owner:0x0 +++_ +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Seg:b540 Size:10944 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ + +Seg:e000 Size:8191 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index 0a03bf3f..c8e3fff5 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,45 +1,45 @@ == default == - USED block at 34bb0016 of size 66 - FREE block at 34bb0058 of size 18 - USED block at 34bb006a of size 136 - USED block at 34bb00f2 of size 20 - FREE block at 34bb0106 of size 7926 + USED block at 253a0016 of size 66 + FREE block at 253a0058 of size 18 + USED block at 253a006a of size 136 + USED block at 253a00f2 of size 20 + FREE block at 253a0106 of size 7926 OK - end of heap == near == - USED block at 24ba9306 of size 12 - USED block at 24ba9312 of size 802 - USED block at 24ba9634 of size 136 - USED block at 24ba96bc of size 20 - USED block at 24ba96d0 of size 20 - USED block at 24ba96e4 of size 20 - USED block at 24ba96f8 of size 20 - USED block at 24ba970c of size 20 - USED block at 24ba9720 of size 26844 + USED block at 15399306 of size 12 + USED block at 15399312 of size 328 + USED block at 1539945a of size 52 + USED block at 1539948e of size 20 + USED block at 153994a2 of size 20 + USED block at 153994b6 of size 20 + USED block at 153994ca of size 20 + USED block at 153994de of size 20 + USED block at 153994f2 of size 27402 OK - end of heap == far == - USED block at 34bb0016 of size 66 - USED block at 34bb0058 of size 18 - USED block at 34bb006a of size 136 - USED block at 34bb00f2 of size 20 - USED block at 34bb0106 of size 7926 + USED block at 253a0016 of size 66 + USED block at 253a0058 of size 18 + USED block at 253a006a of size 136 + USED block at 253a00f2 of size 20 + USED block at 253a0106 of size 7926 OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- Default 8166 222 7944 -Near 27894 1050 26844 +Near 27894 492 27402 Far 8166 222 7944 ---------------- -------- -------- -------- -coreleft = 26842 -farcoreleft = 1892 -GetFreeSize = 40604 -GetNearFreeSize = 26844 -GetFarFreeSize = 40604 -memavl = 26842 -stackavail = 11846 +coreleft = 27400 +farcoreleft = 2422 +GetFreeSize = 40578 +GetNearFreeSize = 27402 +GetFarFreeSize = 40578 +memavl = 27400 +stackavail = 11798 diff --git a/MMDUMP.16W b/MMDUMP.16W index b819e02d1967d33f4e485417779ae884ee876434..defe079d8988a756af12d9facb9c57c4a74ef70a 100755 GIT binary patch delta 21 ccmZ>A;y0);Ffd8BGBis{Qqa)toXBqs067%}X#fBK delta 21 ccmZ>A;y0);Ffd8BGB7YOQ_#@Woyczt05m)Vr~m)} diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c index 3f395173..0b22ed14 100755 --- a/src/lib/16_ca.c +++ b/src/lib/16_ca.c @@ -1111,7 +1111,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar) // #ifndef MAPHEADERLINKED // if ((handle = open("MAPHEAD."EXT, // O_RDONLY | O_BINARY, S_IREAD)) == -1) -// Quit ("Can't open MAPHEAD."EXT"!"); +// printf("Can't open MAPHEAD."EXT"!"); // length = filelength(handle); // MM_GetPtr (&(memptr)tinf,length); // CA_FarRead(handle, tinf, length); -- 2.39.5