From: sparky4 Date: Wed, 7 Sep 2016 17:02:11 +0000 (-0500) Subject: added catacomb3d code for reference X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1319a8e1464531f5cf6a0f672f374f8c20cfe5cb;p=proj16%2F16.git added catacomb3d code for reference --- diff --git a/.gitmodules b/.gitmodules index 3a2fbcd8..11d69bb6 100755 --- a/.gitmodules +++ b/.gitmodules @@ -17,3 +17,7 @@ [submodule "keen"] path = 16/keen url = https://github.com/keendreams/keen.git + +[submodule "Catacomb3D"] + path = 16/Catacomb3D + url = https://github.com/FlatRockSoft/Catacomb3D.git diff --git a/16.BAK b/16.BAK new file mode 100755 index 00000000..aee7ace5 Binary files /dev/null and b/16.BAK differ diff --git a/16/Catacomb3D b/16/Catacomb3D new file mode 160000 index 00000000..aa97f499 --- /dev/null +++ b/16/Catacomb3D @@ -0,0 +1 @@ +Subproject commit aa97f4995dc7dbea3ecc1794a2d4d4354839cad4 diff --git a/DEBUG.16W b/DEBUG.16W index 7ed1d1be..2d02a399 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,17 +1,14 @@ -Seg:0 Size:7737 Owner:0xbf0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ +Seg:0 Size:11821 Owner:0x6 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ 0 -Seg:1e39 Size:256 Owner:0x527a +Seg:2e2d Size:256 Owner:0x527a ++++_  -Seg:1f39 Size:273 Owner:0x92d2 +Seg:2f2d Size:273 Owner:0x92d2 +++++_  -Seg:24c8 Size:40 Owner:0x0 -++_ -00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Seg:b4f0 Size:11024 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ - -Seg:e000 Size:8191 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ \ No newline at end of file +Seg:3499 Size:40 Owner:0x0 ++_ +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +Seg:c4c1 Size:15166 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++_ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index e40afb6e..0a03bf3f 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,45 +1,45 @@ == default == - USED block at 24ea0016 of size 66 - FREE block at 24ea0058 of size 18 - USED block at 24ea006a of size 136 - USED block at 24ea00f2 of size 20 - FREE block at 24ea0106 of size 7926 + 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 OK - end of heap == near == - USED block at 14e99306 of size 12 - USED block at 14e99312 of size 328 - USED block at 14e9945a of size 52 - USED block at 14e9948e of size 20 - USED block at 14e994a2 of size 20 - USED block at 14e994b6 of size 20 - USED block at 14e994ca of size 20 - USED block at 14e994de of size 20 - USED block at 14e994f2 of size 27402 + 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 OK - end of heap == far == - USED block at 24ea0016 of size 66 - USED block at 24ea0058 of size 18 - USED block at 24ea006a of size 136 - USED block at 24ea00f2 of size 20 - USED block at 24ea0106 of size 7926 + 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 OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- Default 8166 222 7944 -Near 27894 492 27402 +Near 27894 1050 26844 Far 8166 222 7944 ---------------- -------- -------- -------- -coreleft = 27400 -farcoreleft = 2422 -GetFreeSize = 40578 -GetNearFreeSize = 27402 -GetFarFreeSize = 40578 -memavl = 27400 +coreleft = 26842 +farcoreleft = 1892 +GetFreeSize = 40604 +GetNearFreeSize = 26844 +GetFarFreeSize = 40604 +memavl = 26842 stackavail = 11846 diff --git a/MMDUMP.16W b/MMDUMP.16W index 6158f07b..b819e02d 100755 Binary files a/MMDUMP.16W and b/MMDUMP.16W differ diff --git a/git_igno.re b/git_igno.re index 3b6f01c0..911e8919 100755 --- a/git_igno.re +++ b/git_igno.re @@ -19,6 +19,7 @@ TODO~ LICENCE~ *.mah *.MAH +!bcexmm.map !makefile !modex.lib img diff --git a/git_modu.les b/git_modu.les index 3a2fbcd8..11d69bb6 100755 --- a/git_modu.les +++ b/git_modu.les @@ -17,3 +17,7 @@ [submodule "keen"] path = 16/keen url = https://github.com/keendreams/keen.git + +[submodule "Catacomb3D"] + path = 16/Catacomb3D + url = https://github.com/FlatRockSoft/Catacomb3D.git