bloody typedefstruct merging is going to be tricky

diff --git a/DEBUG.16W b/DEBUG.16W
index 2d02a3991766d60a76f52d67be4c1aea02baa93d..1fcbed9d35254aa79b3cbc57b20cb4d8c55e6831 100755 (executable)
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,14 +1,17 @@
-\e[0mSeg:0      Size:11821      Owner:0x6\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
+\e[0mSeg:0      Size:7817       Owner:0x16bb\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m0\r
-\e[0m\e[0mSeg:2e2d       Size:256        Owner:0x527a\r
+\e[0m\e[0mSeg:1e89       Size:256        Owner:0x527a\r
 \e[44;34m++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r
-\e[0m\e[0mSeg:2f2d       Size:273        Owner:0x92d2\r
+\e[0m\e[0mSeg:1f89       Size:273        Owner:0x92d2\r
 \e[44;34m+++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r
-\e[0m\e[0mSeg:3499       Size:40 Owner:0x0\r
-\e[41;31m+\e[0m\e[47;37m_\e[0m\r
-\e[42;32m000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
-\e[0m\e[0mSeg:c4c1       Size:15166      Owner:0x0\r
-\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m
\ No newline at end of file
+\e[0m\e[0mSeg:2518       Size:40 Owner:0x0\r
+\e[41;31m++\e[0m\e[47;37m_\e[0m\r
+\e[42;32m0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
+\e[0m\e[0mSeg:b540       Size:10944      Owner:0x0\r
+\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
+\e[42;32m\r
+\e[0m\e[0mSeg:e000       Size:8191       Owner:0x0\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m
\ No newline at end of file

diff --git a/HEAP.16W b/HEAP.16W
index 0a03bf3f40df978e877052371c1db756e039a56f..c8e3fff5596936553d2e2cdd221a21777920272d 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,45 +1,45 @@
 \r
        == default ==\r
 \r
-  USED block at 34bb0016 of size 66\r
-  FREE block at 34bb0058 of size 18\r
-  USED block at 34bb006a of size 136\r
-  USED block at 34bb00f2 of size 20\r
-  FREE block at 34bb0106 of size 7926\r
+  USED block at 253a0016 of size 66\r
+  FREE block at 253a0058 of size 18\r
+  USED block at 253a006a of size 136\r
+  USED block at 253a00f2 of size 20\r
+  FREE block at 253a0106 of size 7926\r
 OK - end of heap\r
 \r
        == near ==\r
 \r
-  USED block at 24ba9306 of size 12\r
-  USED block at 24ba9312 of size 802\r
-  USED block at 24ba9634 of size 136\r
-  USED block at 24ba96bc of size 20\r
-  USED block at 24ba96d0 of size 20\r
-  USED block at 24ba96e4 of size 20\r
-  USED block at 24ba96f8 of size 20\r
-  USED block at 24ba970c of size 20\r
-  USED block at 24ba9720 of size 26844\r
+  USED block at 15399306 of size 12\r
+  USED block at 15399312 of size 328\r
+  USED block at 1539945a of size 52\r
+  USED block at 1539948e of size 20\r
+  USED block at 153994a2 of size 20\r
+  USED block at 153994b6 of size 20\r
+  USED block at 153994ca of size 20\r
+  USED block at 153994de of size 20\r
+  USED block at 153994f2 of size 27402\r
 OK - end of heap\r
 \r
        == far ==\r
 \r
-  USED block at 34bb0016 of size 66\r
-  USED block at 34bb0058 of size 18\r
-  USED block at 34bb006a of size 136\r
-  USED block at 34bb00f2 of size 20\r
-  USED block at 34bb0106 of size 7926\r
+  USED block at 253a0016 of size 66\r
+  USED block at 253a0058 of size 18\r
+  USED block at 253a006a of size 136\r
+  USED block at 253a00f2 of size 20\r
+  USED block at 253a0106 of size 7926\r
 OK - end of heap\r
 \r
 Memory Type         Total      Used       Free\r
 ----------------  --------   --------   --------\r
 Default                   8166         222       7944\r
-Near              27894        1050      26844\r
+Near              27894        492       27402\r
 Far               8166         222       7944\r
 ----------------  --------   --------   --------\r
-coreleft = 26842\r
-farcoreleft = 1892\r
-GetFreeSize = 40604\r
-GetNearFreeSize = 26844\r
-GetFarFreeSize = 40604\r
-memavl = 26842\r
-stackavail = 11846\r
+coreleft = 27400\r
+farcoreleft = 2422\r
+GetFreeSize = 40578\r
+GetNearFreeSize = 27402\r
+GetFarFreeSize = 40578\r
+memavl = 27400\r
+stackavail = 11798\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
index b819e02d1967d33f4e485417779ae884ee876434..defe079d8988a756af12d9facb9c57c4a74ef70a 100755 (executable)
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 3f3951736fc9eb5f05915159a84d891a5d728a06..0b22ed14de172a390aefc526bd33b4f7e88c5caf 100755 (executable)
--- 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\r
 //     if ((handle = open("MAPHEAD."EXT,\r
 //              O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-//             Quit ("Can't open MAPHEAD."EXT"!");\r
+//             printf("Can't open MAPHEAD."EXT"!");\r
 //     length = filelength(handle);\r
 //     MM_GetPtr (&(memptr)tinf,length);\r
 //     CA_FarRead(handle, tinf, length);\r