16_ca needs huge amounts of work and I should remember what needs to be done soon...

diff --git a/DEBUG.16W b/DEBUG.16W
deleted file mode 100755 (executable)
index 257ae9f..0000000
--- a/DEBUG.16W
+++ /dev/null
@@ -1,210 +0,0 @@
-\e[0mSeg:0      Size:10306      Owner:0x0\r
-\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m00\r
-\e[0m\e[0mSeg:2896       Size:76 Owner:0x0\r
-\e[41;31m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:28e2       Size:256        Owner:0x6120\r
-\e[44;34m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:29e2       Size:256        Owner:0x1f62\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:2ae2       Size:256        Owner:0x1f64\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:2be2       Size:256        Owner:0x1f66\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:2ce2       Size:256        Owner:0x1f68\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:2de2       Size:256        Owner:0x1f6a\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:2ee2       Size:256        Owner:0x1f6c\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:2fe2       Size:256        Owner:0x1f6e\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:30e2       Size:256        Owner:0x1f70\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:31e2       Size:256        Owner:0x1f72\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:32e2       Size:256        Owner:0x1f74\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:33e2       Size:256        Owner:0x1f76\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:34e2       Size:256        Owner:0x1f78\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:35e2       Size:256        Owner:0x1f7a\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:36e2       Size:256        Owner:0x1f7c\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:37e2       Size:256        Owner:0x1f7e\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:38e2       Size:256        Owner:0x1f80\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:39e2       Size:256        Owner:0x1f82\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:3ae2       Size:256        Owner:0x1f84\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:3be2       Size:256        Owner:0x1f86\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:3ce2       Size:256        Owner:0x1f88\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:3de2       Size:256        Owner:0x1f8a\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:3ee2       Size:256        Owner:0x1f8c\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:3fe2       Size:256        Owner:0x1f8e\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:40e2       Size:256        Owner:0x1f90\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:41e2       Size:256        Owner:0x1f92\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:42e2       Size:256        Owner:0x1f94\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:43e2       Size:256        Owner:0x1f96\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:44e2       Size:256        Owner:0x1f98\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:45e2       Size:256        Owner:0x1f9a\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:46e2       Size:256        Owner:0x1f9c\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:47e2       Size:256        Owner:0x1f9e\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:48e2       Size:256        Owner:0x1fa0\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:49e2       Size:256        Owner:0x1fa2\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:4ae2       Size:256        Owner:0x1fa4\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:4be2       Size:256        Owner:0x1fa6\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:4ce2       Size:256        Owner:0x1fa8\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:4de2       Size:256        Owner:0x1faa\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:4ee2       Size:256        Owner:0x1fac\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:4fe2       Size:256        Owner:0x1fae\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:50e2       Size:256        Owner:0x1fb0\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:51e2       Size:256        Owner:0x1fb2\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:52e2       Size:256        Owner:0x1fb4\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:53e2       Size:256        Owner:0x1fb6\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:54e2       Size:256        Owner:0x1fb8\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:55e2       Size:256        Owner:0x1fba\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:56e2       Size:256        Owner:0x1fbc\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:57e2       Size:256        Owner:0x1fbe\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:58e2       Size:256        Owner:0x1fc0\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:59e2       Size:256        Owner:0x1fc2\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:5ae2       Size:256        Owner:0x1fc4\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:5be2       Size:256        Owner:0x1fc6\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:5ce2       Size:256        Owner:0x1fc8\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:5de2       Size:256        Owner:0x1fca\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:5ee2       Size:256        Owner:0x1fcc\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:5fe2       Size:256        Owner:0x1fce\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:60e2       Size:256        Owner:0x1fd0\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:61e2       Size:256        Owner:0x1fd2\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:62e2       Size:256        Owner:0x1fd4\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:63e2       Size:256        Owner:0x1fd6\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:64e2       Size:256        Owner:0x1fd8\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:65e2       Size:256        Owner:0x1fda\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:66e2       Size:256        Owner:0x1fdc\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:67e2       Size:256        Owner:0x1fde\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:68e2       Size:256        Owner:0x1fe0\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:69e2       Size:256        Owner:0x1fe2\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:6ae2       Size:256        Owner:0x1fe4\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:6be2       Size:256        Owner:0x1fe6\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:6ce2       Size:256        Owner:0x1fe8\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:6de2       Size:256        Owner:0x1fea\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:6ee2       Size:256        Owner:0x1fec\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:6fe2       Size:256        Owner:0x1fee\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:70e2       Size:256        Owner:0x1ff0\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:71e2       Size:256        Owner:0x1ff2\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:72e2       Size:256        Owner:0x1ff4\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:73e2       Size:256        Owner:0x1ff6\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:74e2       Size:256        Owner:0x1ff8\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:75e2       Size:256        Owner:0x1ffa\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:76e2       Size:256        Owner:0x1ffc\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:77e2       Size:256        Owner:0x1ffe\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:78e2       Size:256        Owner:0x2000\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:79e2       Size:256        Owner:0x2002\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:7ae2       Size:256        Owner:0x2004\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:7be2       Size:256        Owner:0x2006\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:7ce2       Size:256        Owner:0x2008\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:7de2       Size:256        Owner:0x200a\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:7ee2       Size:256        Owner:0x200c\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:7fe2       Size:256        Owner:0x200e\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:80e2       Size:256        Owner:0x2010\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:81e2       Size:256        Owner:0x2012\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:82e2       Size:256        Owner:0x2014\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:83e2       Size:256        Owner:0x2016\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:84e2       Size:256        Owner:0x2018\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:85e2       Size:256        Owner:0x201a\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:86e2       Size:256        Owner:0x201c\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:87e2       Size:256        Owner:0x201e\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:88e2       Size:256        Owner:0x2020\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:89e2       Size:256        Owner:0x2022\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:8ae2       Size:256        Owner:0x2024\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:8be2       Size:256        Owner:0x2026\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:8ce2       Size:256        Owner:0x2028\r
-\e[45;35m\e[0m\e[42;32m0\r
-\e[0m\e[0mSeg:8de2       Size:273        Owner:0x6120\r
-\e[44;34m\e[0m\e[42;32m000000000000000000000000000000000000000000000000\r
-\e[0m\e[0mSeg:9dc1       Size:25150      Owner:0x0\r
-\e[41;31m\e[0m
\ No newline at end of file

diff --git a/HEAP.16W b/HEAP.16W
index 8f8a02d6881a8a58d57aa18df82665edba34e1c5..226750320ac33d3c09639e7105c0070624b43de7 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,81 +1,47 @@
 \r
-       == default ==\r
-\r
-  USED block at 2ed20016 of size 4098\r
-  USED block at 2ed21018 of size 20\r
-  USED block at 2ed2102c of size 66\r
-  USED block at 2ed2106e of size 50\r
-  USED block at 2ed210a0 of size 50\r
-  USED block at 2ed210d2 of size 50\r
-  USED block at 2ed21104 of size 50\r
-  USED block at 2ed21136 of size 50\r
-  USED block at 2ed21168 of size 50\r
-  USED block at 2ed2119a of size 50\r
-  USED block at 2ed211cc of size 50\r
-  USED block at 2ed211fe of size 50\r
-  USED block at 2ed21230 of size 50\r
-  USED block at 2ed21262 of size 50\r
-  USED block at 2ed21294 of size 50\r
-  FREE block at 2ed212c6 of size 29552\r
-  USED block at 2ed28636 of size 1202\r
-  USED block at 2ed28ae8 of size 1202\r
-  USED block at 2ed28f9a of size 1202\r
-  USED block at 2ed2944c of size 136\r
-  USED block at 2ed294d4 of size 22\r
-  FREE block at 2ed294ea of size 8202\r
-  FREE block at 2ed2b4f4 of size 0\r
-ERROR - bad node in heap\r
-\r
        == near ==\r
 \r
-  FREE block at 1ed1f9f6 of size 12\r
-  FREE block at 1ed1fa02 of size 320\r
-  FREE block at 1ed1fb42 of size 52\r
-  FREE block at 1ed1fb76 of size 20\r
-  FREE block at 1ed1fb8a of size 20\r
-  FREE block at 1ed1fb9e of size 20\r
-  FREE block at 1ed1fbb2 of size 20\r
-  FREE block at 1ed1fbc6 of size 20\r
-  FREE block at 1ed1fbda of size 1058\r
+  USED block at 1d0d:f9a6 of size 12\r
+  USED block at 1d0d:f9b2 of size 320\r
+  USED block at 1d0d:faf2 of size 52\r
+  USED block at 1d0d:fb26 of size 20\r
+  USED block at 1d0d:fb3a of size 20\r
+  USED block at 1d0d:fb4e of size 20\r
+  USED block at 1d0d:fb62 of size 20\r
+  USED block at 1d0d:fb76 of size 20\r
+  FREE block at 1d0d:fb8a of size 1138\r
 OK - end of heap\r
 \r
        == far ==\r
 \r
-  FREE block at 2ed20016 of size 4098\r
-  FREE block at 2ed21018 of size 20\r
-  FREE block at 2ed2102c of size 66\r
-  FREE block at 2ed2106e of size 50\r
-  FREE block at 2ed210a0 of size 50\r
-  FREE block at 2ed210d2 of size 50\r
-  FREE block at 2ed21104 of size 50\r
-  FREE block at 2ed21136 of size 50\r
-  FREE block at 2ed21168 of size 50\r
-  FREE block at 2ed2119a of size 50\r
-  FREE block at 2ed211cc of size 50\r
-  FREE block at 2ed211fe of size 50\r
-  FREE block at 2ed21230 of size 50\r
-  FREE block at 2ed21262 of size 50\r
-  FREE block at 2ed21294 of size 50\r
-  FREE block at 2ed212c6 of size 29552\r
-  FREE block at 2ed28636 of size 1202\r
-  FREE block at 2ed28ae8 of size 1202\r
-  FREE block at 2ed28f9a of size 1202\r
-  FREE block at 2ed2944c of size 136\r
-  FREE block at 2ed294d4 of size 22\r
-  FREE block at 2ed294ea of size 8202\r
-  FREE block at 2ed2b4f4 of size 0\r
-ERROR - bad node in heap\r
+  USED block at 2d0e:0016 of size 10246\r
+  USED block at 2d0e:281c of size 136\r
+  USED block at 2d0e:28a4 of size 66\r
+  USED block at 2d0e:28e6 of size 50\r
+  USED block at 2d0e:2918 of size 50\r
+  USED block at 2d0e:294a of size 50\r
+  USED block at 2d0e:297c of size 50\r
+  USED block at 2d0e:29ae of size 50\r
+  USED block at 2d0e:29e0 of size 50\r
+  USED block at 2d0e:2a12 of size 50\r
+  USED block at 2d0e:2a44 of size 50\r
+  USED block at 2d0e:2a76 of size 50\r
+  USED block at 2d0e:2aa8 of size 50\r
+  USED block at 2d0e:2ada of size 50\r
+  USED block at 2d0e:2b0c of size 50\r
+  USED block at 2d0e:2b3e of size 20\r
+  FREE block at 2d0e:2b52 of size 7370\r
+OK - end of heap\r
 \r
 Memory Type         Total      Used       Free\r
 ----------------  --------   --------   --------\r
-Default                   46302        8548      37754\r
-Near              1542         484       1058\r
-Far               46302        8548      37754\r
+Near              1622         484       1138\r
+Far               18438        11068     7370\r
 ----------------  --------   --------   --------\r
-HC_coreleft = 1056\r
-HC_farcoreleft = 415744\r
-HC_GetFreeSize = 37754\r
-HC_GetNearFreeSize = 1058\r
-HC_GetFarFreeSize = 37754\r
-memavl = 1056\r
-stackavail = 31484\r
+HC_coreleft = 1136\r
+HC_farcoreleft = 450560\r
+HC_GetFreeSize = 7370\r
+HC_GetNearFreeSize = 1138\r
+HC_GetFarFreeSize = 7370\r
+memavl = 1136\r
+stackavail = 31498\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
index 276718ef91cb1f13c1aedf751a472b98ad369144..1c61f4331acaabb8a4f75f9178df8fce26ecc8ed 100755 (executable)
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ

diff --git a/XCROLL.16W b/XCROLL.16W
deleted file mode 100755 (executable)
index 32f5ab2..0000000
Binary files a/XCROLL.16W and /dev/null differ

diff --git a/XCROLL1.16W b/XCROLL1.16W
deleted file mode 100755 (executable)
index 10ab33c..0000000
Binary files a/XCROLL1.16W and /dev/null differ

diff --git a/XCROLL2.16W b/XCROLL2.16W
deleted file mode 100755 (executable)
index 276718e..0000000
Binary files a/XCROLL2.16W and /dev/null differ

diff --git a/XCROLL3.16W b/XCROLL3.16W
deleted file mode 100755 (executable)
index 276718e..0000000
Binary files a/XCROLL3.16W and /dev/null differ

diff --git a/XCROLL4.16W b/XCROLL4.16W
deleted file mode 100755 (executable)
index 32f5ab2..0000000
Binary files a/XCROLL4.16W and /dev/null differ

diff --git a/src/lib/16_hc.c b/src/lib/16_hc.c
index f2963158f9fa4154055d171b64277d4092a8fec3..e80d7714a85d50f33f0afdce976e1f44aa33b79b 100755 (executable)
--- a/src/lib/16_hc.c
+++ b/src/lib/16_hc.c
@@ -421,13 +421,14 @@ size_t HC_GetNearFreeSize(void)
 \r
 void HC_heapdump(global_game_variables_t *gvar)\r
 {\r
-       struct _heapinfo fh_info, nh_info, h_info;\r
+       struct _heapinfo fh_info, nh_info;//, h_info;\r
        int heap_status;\r
-       size_t h_free, nh_free, fh_free, h_total, nh_total, fh_total, h_used, nh_used, fh_used;\r
+       size_t nh_free, fh_free, nh_total, fh_total, nh_used, fh_used;//,       h_free, h_total, h_used;\r
        byte    scratch[1024],str[16];\r
 \r
        HC_OpenDebug(gvar);\r
 \r
+#if 0\r
        strcpy(scratch,"\n      == default ==\n\n");\r
        write(gvar->handle.heaphandle,scratch,strlen(scratch));\r
        h_info._pentry = NULL;\r
@@ -435,13 +436,16 @@ void HC_heapdump(global_game_variables_t *gvar)
        for(;;) {\r
                heap_status = _heapwalk( &h_info );\r
                if( heap_status != _HEAPOK ) break;\r
-               strcpy(scratch,"  "); strcat(scratch,(h_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at "); ultoa((dword)h_info._pentry,str,16); strcat(scratch,str); strcat(scratch," of size "); ultoa(h_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n");\r
+               strcpy(scratch,"  "); strcat(scratch,(h_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at ");\r
+               sprintf(str, "%Fp", h_info._pentry); //ultoa((dword)h_info._pentry,str,16);\r
+                       strcat(scratch,str); strcat(scratch," of size "); ultoa(h_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n");\r
                if((h_info._useflag == _USEDENTRY ? "USED" : "FREE")=="FREE") h_free += h_info._size;\r
                if((h_info._useflag == _USEDENTRY ? "USED" : "FREE")=="USED") h_used += h_info._size;\r
                h_total += h_info._size;\r
                write(gvar->handle.heaphandle,scratch,strlen(scratch));\r
        }\r
        HC_heapstat(gvar, heap_status, &scratch);\r
+#endif\r
 \r
        //near\r
        strcpy(scratch,"\n      == near ==\n\n");\r
@@ -451,7 +455,9 @@ void HC_heapdump(global_game_variables_t *gvar)
        for(;;) {\r
                heap_status = _nheapwalk( &nh_info );\r
                if( heap_status != _HEAPOK ) break;\r
-               strcpy(scratch,"  "); strcat(scratch,(h_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at "); ultoa((dword)nh_info._pentry,str,16); strcat(scratch,str); strcat(scratch," of size "); ultoa(nh_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n");\r
+               strcpy(scratch,"  "); strcat(scratch,(nh_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at ");\r
+               sprintf(str, "%Fp", nh_info._pentry); //ultoa((dword)nh_info._pentry,str,16);\r
+                       strcat(scratch,str); strcat(scratch," of size "); ultoa(nh_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n");\r
 /*             printf( "  %s block at %Fp of size %4.4X\n",\r
 (nh_info._useflag == _USEDENTRY ? "USED" : "FREE"),\r
 nh_info._pentry, nh_info._size );*/\r
@@ -470,7 +476,9 @@ nh_info._pentry, nh_info._size );*/
        for(;;) {\r
                heap_status = _fheapwalk( &fh_info );\r
                if( heap_status != _HEAPOK ) break;\r
-               strcpy(scratch,"  "); strcat(scratch,(h_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at "); ultoa((dword)fh_info._pentry,str,16); strcat(scratch,str); strcat(scratch," of size "); ultoa(fh_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n");\r
+               strcpy(scratch,"  "); strcat(scratch,(fh_info._useflag == _USEDENTRY ? "USED" : "FREE")); strcat(scratch," block at ");\r
+               sprintf(str, "%Fp", fh_info._pentry); //ultoa((dword)fh_info._pentry,str,16);\r
+                       strcat(scratch,str); strcat(scratch," of size "); ultoa(fh_info._size,str,10); strcat(scratch,str); strcat(scratch,"\n");\r
                /*printf( "  %s block at %Fp of size %4.4X\n",\r
 (fh_info._useflag == _USEDENTRY ? "USED" : "FREE"),\r
 fh_info._pentry, fh_info._size );*/\r
@@ -484,7 +492,7 @@ fh_info._pentry, fh_info._size );*/
        strcpy(scratch,"\n");\r
        strcat(scratch,kittengets(2,0,"Memory Type         Total      Used       Free\n"));\r
        strcat(scratch,"----------------  --------   --------   --------\n");\r
-       printmeminfoline(&scratch, "Default", h_total, h_used, h_free);\r
+//     printmeminfoline(&scratch, "Default", h_total, h_used, h_free);\r
        printmeminfoline(&scratch, "Near", nh_total, nh_used, nh_free);\r
        printmeminfoline(&scratch, "Far", fh_total, fh_used, fh_free);\r
        strcat(scratch,"----------------  --------   --------   --------\n");\r
@@ -554,15 +562,22 @@ void HC_OpenDebug(global_game_variables_t *gvar)
 {\r
 #ifdef __BORLANDC__\r
        unlink("heap.16b");\r
-       gvar->handle.heaphandle = open("heap.16b", O_CREAT | O_WRONLY | O_TEXT);\r
+       gvar->handle.heaphandle = open(gvar->handle.heapdumpfilename, O_CREAT | O_WRONLY | O_TEXT);\r
 #endif\r
 #ifdef __WATCOMC__\r
        unlink("heap.16w");\r
-       gvar->handle.heaphandle = open("heap.16w", O_CREAT | O_WRONLY | O_TEXT);\r
+       gvar->handle.heaphandle = open(gvar->handle.heapdumpfilename, O_CREAT | O_WRONLY | O_TEXT);\r
 #endif\r
 }\r
 \r
 void HC_CloseDebug(global_game_variables_t *gvar)\r
 {\r
        close(gvar->handle.heaphandle);\r
+\r
+#ifdef __BORLANDC__\r
+       strcpy(gvar->handle.heapdumpfilename, "heap.16b");\r
+#endif\r
+#ifdef __WATCOMC__\r
+       strcpy(gvar->handle.heapdumpfilename, "heap.16w");\r
+#endif\r
 }\r

diff --git a/src/lib/16_head.c b/src/lib/16_head.c
index 8786a9fd3787f7054175153bb5fd4147139a78c2..1af195348864d51b8a1d690f5677cef1d102c7c8 100755 (executable)
--- a/src/lib/16_head.c
+++ b/src/lib/16_head.c
@@ -22,6 +22,10 @@
 \r
 #include "src/lib/16_head.h"\r
 \r
+// big global status text buffer\r
+char global_temp_status_text[512];\r
+char global_temp_status_text2[512];\r
+\r
 long int\r
 filesize(FILE *fp)\r
 {\r

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index e2e38ca1d375b13c19ce1ac28f516406dd477b88..c5c51486ef9d8d01f6626968657c6cfda337af32 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -823,6 +823,13 @@ void MM_Reset (global_game_variables_t *gvar)
 #ifdef __WATCOMC__\r
        strcpy(gvar->handle.datadumpfilename, "mmdump.16w");\r
 #endif\r
+\r
+#ifdef __BORLANDC__\r
+       strcpy(gvar->handle.heapdumpfilename, "heap.16b");\r
+#endif\r
+#ifdef __WATCOMC__\r
+       strcpy(gvar->handle.heapdumpfilename, "heap.16w");\r
+#endif\r
 }\r
 \r
 \r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 8eeaefd7c1c30862201ee93c9e90270b8d2e8f5b..2d3e606722ce5748d135d47b09396111e0e97567 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -335,6 +335,7 @@ typedef struct
        int profilehandle,debughandle,showmemhandle;\r
        int heaphandle;\r
        byte datadumpfilename[12];\r
+       byte heapdumpfilename[12];\r
 } loghandle_t;\r
 \r
 typedef struct\r

diff --git a/src/lib/16_vl_2.c b/src/lib/16_vl_2.c
index 2b79a76ff0d1dbfc496a28e0eb2ef0885d17325e..4030685527e93c0f5afb47a12a2c0526fd29d7a6 100755 (executable)
--- a/src/lib/16_vl_2.c
+++ b/src/lib/16_vl_2.c
@@ -25,10 +25,6 @@
 #include <stdlib.h>\r
 #include "src/lib/16_vl.h"\r
 \r
-// big global status text buffer\r
-char global_temp_status_text[512];\r
-char global_temp_status_text2[512];\r
-\r
 #define PRINTTEXTBOXSTABLE\r
 \r
 void VL_modexPrintTextBox(global_game_variables_t *gvar)\r

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index a3f28541c9ba5d007c0d447b5ad27633707059d7..42b2621f8416645313f103b9b32ed4513488aa66 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -662,7 +662,7 @@ sword chkmap(map_t *map, word q)
 //1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1 };\r
 //1,   2,      3,      4,      0,      3,      3,      3,      3,      3,      3,      3,      3,      4,      1,      1,      1,      1,      1,      1,      5,      6,      7,      8,      0,      1,      0,      1,      0,      0,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      9,      10,     11,     12,     4,      1,      0,      1,      0,      0,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      13,     14,     15,     16,     0,      1,      1,      1,      5,      8,      1,      11,     11,     1,      1,      1,      1,      1,      1,      1,      0,      0,      4,      0,      0,      0,      0,      0,      8,      8,      1,      11,     11,     3,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      0,      0,      0,      0,      8,      8,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      0,      0,      0,      0,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      0,      0,      0,      0,      1,      1,      1,      1,      1,      1,      1,      1,      3,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      3,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      3,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      3,      3,      3,      3,      1,      2,      3,      4 };\r
        //check for failed to load map\r
-       if((map->width == map->height == 0) && (q>0))\r
+       if((!map->width || !map->height) && (q>0))\r
        {\r
                //initiate a null map!\r
                map->width=MAPW;\r

diff --git a/src/xcroll.c b/src/xcroll.c
index 816c600e4689e587db7958470d419f53617acc59..efa76b750ec441f5d099d8226222657f8d381f03 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -28,7 +28,7 @@
 //#define NOMAPLOAD\r
 //#define OLDPLAYERSPRITESTUFF\r
 #ifdef __DEBUG__\r
-//#define SCROLLEXEDEBUG\r
+#define SCROLLEXEDEBUG\r
 boolean\r
        dbg_nointest=1;\r
 #endif\r
@@ -95,11 +95,12 @@ void main(int argc, char *argv[])
 \r
        // create the map\r
                #ifdef SCROLLEXEDEBUG\r
-       strcpy(gvar.handle.datadumpfilename, "xcroll1.16w");    MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.datadumpfilename, "mmdump1.16w");  MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.heapdumpfilename, "heap1.16w");            HC_heapdump(&gvar);\r
        //fprintf(stderr, "testing map load~    ");\r
                #endif\r
-       CA_loadmap("data/test.map", &gvar.map, &gvar);\r
 #ifndef NOMAPLOAD\r
+       CA_loadmap("data/test.map", &gvar.map, &gvar);\r
        chkmap(&gvar.map, 0);\r
 #else\r
        chkmap(&gvar.map, 1);\r
@@ -108,7 +109,8 @@ void main(int argc, char *argv[])
                #ifdef SCROLLEXEDEBUG\r
        printf("chkmap ok\n");\r
 //     fprintf(stderr, "yay map loaded~~\n");\r
-       strcpy(gvar.handle.datadumpfilename, "xcroll2.16w");    MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.datadumpfilename, "mmdump2.16w");  MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.heapdumpfilename, "heap2.16w");            HC_heapdump(&gvar);\r
                #endif\r
 \r
        // data\r
@@ -118,14 +120,15 @@ void main(int argc, char *argv[])
 #else\r
                #ifdef SCROLLEXEDEBUG\r
        fprintf(stderr, "VRS_LoadVRS~   ");\r
-       strcpy(gvar.handle.datadumpfilename, "xcroll3.16w");    MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.datadumpfilename, "mmdump3.16w");  MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.heapdumpfilename, "heap3.16w");            HC_heapdump(&gvar);\r
                #endif\r
        VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar);\r
                #ifdef SCROLLEXEDEBUG\r
        printf("VRS load OK~\n");\r
-       strcpy(gvar.handle.datadumpfilename, "xcroll4.16w");    MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.datadumpfilename, "mmdump4.16w");  MM_DumpData (&gvar);\r
+       //strcpy(gvar.handle.heapdumpfilename, "heap4.16w");            HC_heapdump(&gvar);\r
                #endif\r
-       strcpy(gvar.handle.datadumpfilename, "xcroll.16w");\r
 #endif\r
 \r
        // input!\r