wwww

diff --git a/16/Catacomb3D b/16/Catacomb3D
deleted file mode 160000 (submodule)
index aa97f49..0000000
--- a/16/Catacomb3D
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aa97f4995dc7dbea3ecc1794a2d4d4354839cad4

diff --git a/16/CatacombApocalypse b/16/CatacombApocalypse
deleted file mode 160000 (submodule)
index 374403e..0000000
--- a/16/CatacombApocalypse
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 374403ea47e9f6d69829c518c6ebee779b314703

diff --git a/16/keen b/16/keen
deleted file mode 160000 (submodule)
index 4348b47..0000000
--- a/16/keen
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4348b4719be87a0b873f5f4f77b4de82ddf7050c

diff --git a/16/wolf3d b/16/wolf3d
deleted file mode 160000 (submodule)
index 0516778..0000000
--- a/16/wolf3d
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 05167784ef009d0d0daefe8d012b027f39dc8541

diff --git a/DEBUG.16W b/DEBUG.16W
index 46a5385a7f172be7467ed3a391c887e9f33c2129..937d20e6ae84bdf6b8c1ca26128d9b7a4eb2a223 100755 (executable)
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,210 +1,210 @@
-\e[0mSeg:0      Size:10100      Owner:0x0\r
-\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m0000\r
-\e[0m\e[0mSeg:286d       Size:44 Owner:0x0\r
-\e[41;31m+\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2899       Size:256        Owner:0x1650\r
-\e[44;34m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2999       Size:256        Owner:0x1442\r
+\e[0mSeg:0      Size:10238      Owner:0x0\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m0000\r
+\e[0m\e[0mSeg:28e9       Size:45 Owner:0x0\r
+\e[41;31m++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2916       Size:256        Owner:0x1650\r
+\e[44;34m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2a16       Size:256        Owner:0x1442\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2a99       Size:256        Owner:0x1444\r
+\e[0m\e[0mSeg:2b16       Size:256        Owner:0x1444\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2c16       Size:256        Owner:0x1446\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2d16       Size:256        Owner:0x1448\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2b99       Size:256        Owner:0x1446\r
+\e[0m\e[0mSeg:2e16       Size:256        Owner:0x144a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2c99       Size:256        Owner:0x1448\r
+\e[0m\e[0mSeg:2f16       Size:256        Owner:0x144c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2d99       Size:256        Owner:0x144a\r
+\e[0m\e[0mSeg:3016       Size:256        Owner:0x144e\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2e99       Size:256        Owner:0x144c\r
+\e[0m\e[0mSeg:3116       Size:256        Owner:0x1450\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:2f99       Size:256        Owner:0x144e\r
+\e[0m\e[0mSeg:3216       Size:256        Owner:0x1452\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3099       Size:256        Owner:0x1450\r
+\e[0m\e[0mSeg:3316       Size:256        Owner:0x1454\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3199       Size:256        Owner:0x1452\r
+\e[0m\e[0mSeg:3416       Size:256        Owner:0x1456\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3299       Size:256        Owner:0x1454\r
+\e[0m\e[0mSeg:3516       Size:256        Owner:0x1458\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3399       Size:256        Owner:0x1456\r
+\e[0m\e[0mSeg:3616       Size:256        Owner:0x145a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3499       Size:256        Owner:0x1458\r
+\e[0m\e[0mSeg:3716       Size:256        Owner:0x145c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3599       Size:256        Owner:0x145a\r
+\e[0m\e[0mSeg:3816       Size:256        Owner:0x145e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3699       Size:256        Owner:0x145c\r
+\e[0m\e[0mSeg:3916       Size:256        Owner:0x1460\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3799       Size:256        Owner:0x145e\r
+\e[0m\e[0mSeg:3a16       Size:256        Owner:0x1462\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3899       Size:256        Owner:0x1460\r
+\e[0m\e[0mSeg:3b16       Size:256        Owner:0x1464\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3999       Size:256        Owner:0x1462\r
+\e[0m\e[0mSeg:3c16       Size:256        Owner:0x1466\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3a99       Size:256        Owner:0x1464\r
+\e[0m\e[0mSeg:3d16       Size:256        Owner:0x1468\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3b99       Size:256        Owner:0x1466\r
+\e[0m\e[0mSeg:3e16       Size:256        Owner:0x146a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3c99       Size:256        Owner:0x1468\r
+\e[0m\e[0mSeg:3f16       Size:256        Owner:0x146c\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3d99       Size:256        Owner:0x146a\r
+\e[0m\e[0mSeg:4016       Size:256        Owner:0x146e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3e99       Size:256        Owner:0x146c\r
+\e[0m\e[0mSeg:4116       Size:256        Owner:0x1470\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:3f99       Size:256        Owner:0x146e\r
+\e[0m\e[0mSeg:4216       Size:256        Owner:0x1472\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4099       Size:256        Owner:0x1470\r
+\e[0m\e[0mSeg:4316       Size:256        Owner:0x1474\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4199       Size:256        Owner:0x1472\r
+\e[0m\e[0mSeg:4416       Size:256        Owner:0x1476\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4299       Size:256        Owner:0x1474\r
+\e[0m\e[0mSeg:4516       Size:256        Owner:0x1478\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4399       Size:256        Owner:0x1476\r
+\e[0m\e[0mSeg:4616       Size:256        Owner:0x147a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4499       Size:256        Owner:0x1478\r
+\e[0m\e[0mSeg:4716       Size:256        Owner:0x147c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4599       Size:256        Owner:0x147a\r
+\e[0m\e[0mSeg:4816       Size:256        Owner:0x147e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4699       Size:256        Owner:0x147c\r
+\e[0m\e[0mSeg:4916       Size:256        Owner:0x1480\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4799       Size:256        Owner:0x147e\r
+\e[0m\e[0mSeg:4a16       Size:256        Owner:0x1482\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4899       Size:256        Owner:0x1480\r
+\e[0m\e[0mSeg:4b16       Size:256        Owner:0x1484\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4999       Size:256        Owner:0x1482\r
+\e[0m\e[0mSeg:4c16       Size:256        Owner:0x1486\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4a99       Size:256        Owner:0x1484\r
+\e[0m\e[0mSeg:4d16       Size:256        Owner:0x1488\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4b99       Size:256        Owner:0x1486\r
+\e[0m\e[0mSeg:4e16       Size:256        Owner:0x148a\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4c99       Size:256        Owner:0x1488\r
+\e[0m\e[0mSeg:4f16       Size:256        Owner:0x148c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4d99       Size:256        Owner:0x148a\r
+\e[0m\e[0mSeg:5016       Size:256        Owner:0x148e\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4e99       Size:256        Owner:0x148c\r
+\e[0m\e[0mSeg:5116       Size:256        Owner:0x1490\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:4f99       Size:256        Owner:0x148e\r
+\e[0m\e[0mSeg:5216       Size:256        Owner:0x1492\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5099       Size:256        Owner:0x1490\r
+\e[0m\e[0mSeg:5316       Size:256        Owner:0x1494\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5199       Size:256        Owner:0x1492\r
+\e[0m\e[0mSeg:5416       Size:256        Owner:0x1496\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5299       Size:256        Owner:0x1494\r
+\e[0m\e[0mSeg:5516       Size:256        Owner:0x1498\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5399       Size:256        Owner:0x1496\r
+\e[0m\e[0mSeg:5616       Size:256        Owner:0x149a\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5499       Size:256        Owner:0x1498\r
+\e[0m\e[0mSeg:5716       Size:256        Owner:0x149c\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5599       Size:256        Owner:0x149a\r
+\e[0m\e[0mSeg:5816       Size:256        Owner:0x149e\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5699       Size:256        Owner:0x149c\r
+\e[0m\e[0mSeg:5916       Size:256        Owner:0x14a0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5799       Size:256        Owner:0x149e\r
+\e[0m\e[0mSeg:5a16       Size:256        Owner:0x14a2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5899       Size:256        Owner:0x14a0\r
+\e[0m\e[0mSeg:5b16       Size:256        Owner:0x14a4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5999       Size:256        Owner:0x14a2\r
+\e[0m\e[0mSeg:5c16       Size:256        Owner:0x14a6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5a99       Size:256        Owner:0x14a4\r
+\e[0m\e[0mSeg:5d16       Size:256        Owner:0x14a8\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5b99       Size:256        Owner:0x14a6\r
+\e[0m\e[0mSeg:5e16       Size:256        Owner:0x14aa\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5c99       Size:256        Owner:0x14a8\r
+\e[0m\e[0mSeg:5f16       Size:256        Owner:0x14ac\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5d99       Size:256        Owner:0x14aa\r
+\e[0m\e[0mSeg:6016       Size:256        Owner:0x14ae\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5e99       Size:256        Owner:0x14ac\r
+\e[0m\e[0mSeg:6116       Size:256        Owner:0x14b0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:5f99       Size:256        Owner:0x14ae\r
+\e[0m\e[0mSeg:6216       Size:256        Owner:0x14b2\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6099       Size:256        Owner:0x14b0\r
+\e[0m\e[0mSeg:6316       Size:256        Owner:0x14b4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6199       Size:256        Owner:0x14b2\r
+\e[0m\e[0mSeg:6416       Size:256        Owner:0x14b6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6299       Size:256        Owner:0x14b4\r
+\e[0m\e[0mSeg:6516       Size:256        Owner:0x14b8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6399       Size:256        Owner:0x14b6\r
+\e[0m\e[0mSeg:6616       Size:256        Owner:0x14ba\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6499       Size:256        Owner:0x14b8\r
+\e[0m\e[0mSeg:6716       Size:256        Owner:0x14bc\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6599       Size:256        Owner:0x14ba\r
+\e[0m\e[0mSeg:6816       Size:256        Owner:0x14be\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6699       Size:256        Owner:0x14bc\r
+\e[0m\e[0mSeg:6916       Size:256        Owner:0x14c0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6799       Size:256        Owner:0x14be\r
+\e[0m\e[0mSeg:6a16       Size:256        Owner:0x14c2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6899       Size:256        Owner:0x14c0\r
+\e[0m\e[0mSeg:6b16       Size:256        Owner:0x14c4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6999       Size:256        Owner:0x14c2\r
+\e[0m\e[0mSeg:6c16       Size:256        Owner:0x14c6\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6a99       Size:256        Owner:0x14c4\r
+\e[0m\e[0mSeg:6d16       Size:256        Owner:0x14c8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6b99       Size:256        Owner:0x14c6\r
+\e[0m\e[0mSeg:6e16       Size:256        Owner:0x14ca\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6c99       Size:256        Owner:0x14c8\r
+\e[0m\e[0mSeg:6f16       Size:256        Owner:0x14cc\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6d99       Size:256        Owner:0x14ca\r
+\e[0m\e[0mSeg:7016       Size:256        Owner:0x14ce\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6e99       Size:256        Owner:0x14cc\r
+\e[0m\e[0mSeg:7116       Size:256        Owner:0x14d0\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:6f99       Size:256        Owner:0x14ce\r
+\e[0m\e[0mSeg:7216       Size:256        Owner:0x14d2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7099       Size:256        Owner:0x14d0\r
+\e[0m\e[0mSeg:7316       Size:256        Owner:0x14d4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7199       Size:256        Owner:0x14d2\r
+\e[0m\e[0mSeg:7416       Size:256        Owner:0x14d6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7299       Size:256        Owner:0x14d4\r
+\e[0m\e[0mSeg:7516       Size:256        Owner:0x14d8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7399       Size:256        Owner:0x14d6\r
+\e[0m\e[0mSeg:7616       Size:256        Owner:0x14da\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7499       Size:256        Owner:0x14d8\r
+\e[0m\e[0mSeg:7716       Size:256        Owner:0x14dc\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7599       Size:256        Owner:0x14da\r
+\e[0m\e[0mSeg:7816       Size:256        Owner:0x14de\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7699       Size:256        Owner:0x14dc\r
+\e[0m\e[0mSeg:7916       Size:256        Owner:0x14e0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7799       Size:256        Owner:0x14de\r
+\e[0m\e[0mSeg:7a16       Size:256        Owner:0x14e2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7899       Size:256        Owner:0x14e0\r
+\e[0m\e[0mSeg:7b16       Size:256        Owner:0x14e4\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7999       Size:256        Owner:0x14e2\r
+\e[0m\e[0mSeg:7c16       Size:256        Owner:0x14e6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7a99       Size:256        Owner:0x14e4\r
+\e[0m\e[0mSeg:7d16       Size:256        Owner:0x14e8\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7b99       Size:256        Owner:0x14e6\r
+\e[0m\e[0mSeg:7e16       Size:256        Owner:0x14ea\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7c99       Size:256        Owner:0x14e8\r
+\e[0m\e[0mSeg:7f16       Size:256        Owner:0x14ec\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7d99       Size:256        Owner:0x14ea\r
+\e[0m\e[0mSeg:8016       Size:256        Owner:0x14ee\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7e99       Size:256        Owner:0x14ec\r
+\e[0m\e[0mSeg:8116       Size:256        Owner:0x14f0\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:7f99       Size:256        Owner:0x14ee\r
+\e[0m\e[0mSeg:8216       Size:256        Owner:0x14f2\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8099       Size:256        Owner:0x14f0\r
+\e[0m\e[0mSeg:8316       Size:256        Owner:0x14f4\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8199       Size:256        Owner:0x14f2\r
+\e[0m\e[0mSeg:8416       Size:256        Owner:0x14f6\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8299       Size:256        Owner:0x14f4\r
+\e[0m\e[0mSeg:8516       Size:256        Owner:0x14f8\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8399       Size:256        Owner:0x14f6\r
+\e[0m\e[0mSeg:8616       Size:256        Owner:0x14fa\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8499       Size:256        Owner:0x14f8\r
+\e[0m\e[0mSeg:8716       Size:256        Owner:0x14fc\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8599       Size:256        Owner:0x14fa\r
+\e[0m\e[0mSeg:8816       Size:256        Owner:0x14fe\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8699       Size:256        Owner:0x14fc\r
+\e[0m\e[0mSeg:8916       Size:256        Owner:0x1500\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8799       Size:256        Owner:0x14fe\r
+\e[0m\e[0mSeg:8a16       Size:256        Owner:0x1502\r
 \e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8899       Size:256        Owner:0x1500\r
+\e[0m\e[0mSeg:8b16       Size:256        Owner:0x1504\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8999       Size:256        Owner:0x1502\r
+\e[0m\e[0mSeg:8c16       Size:256        Owner:0x1506\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8a99       Size:256        Owner:0x1504\r
+\e[0m\e[0mSeg:8d16       Size:256        Owner:0x1508\r
 \e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8b99       Size:256        Owner:0x1506\r
-\e[45;35m++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8c99       Size:256        Owner:0x1508\r
-\e[45;35m+++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:8d99       Size:401        Owner:0xec12\r
+\e[0m\e[0mSeg:8e16       Size:401        Owner:0xec1c\r
 \e[44;34m++++++\e[0m\e[42;32m\r
-\e[0m\e[0mSeg:b899       Size:18278      Owner:0x0\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m
\ No newline at end of file
+\e[0m\e[0mSeg:b916       Size:18153      Owner:0x0\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m
\ No newline at end of file

diff --git a/HEAP.16W b/HEAP.16W
index b238d5292904e7745b286466f6d5473544dc8aa0..b81227968c93ff6d14da6a249bd4c7c9db449d08 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,69 +1,69 @@
 \r
        == default ==\r
 \r
-  USED block at 288f0016 of size 136\r
-  FREE block at 288f009e of size 68\r
-  USED block at 288f00e2 of size 50\r
-  USED block at 288f0114 of size 50\r
-  USED block at 288f0146 of size 50\r
-  USED block at 288f0178 of size 50\r
-  USED block at 288f01aa of size 50\r
-  USED block at 288f01dc of size 50\r
-  USED block at 288f020e of size 50\r
-  USED block at 288f0240 of size 50\r
-  USED block at 288f0272 of size 50\r
-  USED block at 288f02a4 of size 50\r
-  USED block at 288f02d6 of size 50\r
-  USED block at 288f0308 of size 50\r
-  FREE block at 288f033a of size 14\r
-  USED block at 288f0348 of size 20\r
-  FREE block at 288f035c of size 7328\r
+  USED block at 290c0016 of size 136\r
+  FREE block at 290c009e of size 68\r
+  USED block at 290c00e2 of size 50\r
+  USED block at 290c0114 of size 50\r
+  USED block at 290c0146 of size 50\r
+  USED block at 290c0178 of size 50\r
+  USED block at 290c01aa of size 50\r
+  USED block at 290c01dc of size 50\r
+  USED block at 290c020e of size 50\r
+  USED block at 290c0240 of size 50\r
+  USED block at 290c0272 of size 50\r
+  USED block at 290c02a4 of size 50\r
+  USED block at 290c02d6 of size 50\r
+  USED block at 290c0308 of size 50\r
+  FREE block at 290c033a of size 14\r
+  USED block at 290c0348 of size 20\r
+  FREE block at 290c035c of size 7328\r
 OK - end of heap\r
 \r
        == near ==\r
 \r
-  USED block at 188eec66 of size 12\r
-  USED block at 188eec72 of size 330\r
-  USED block at 188eedbc of size 52\r
-  USED block at 188eedf0 of size 20\r
-  USED block at 188eee04 of size 20\r
-  USED block at 188eee18 of size 20\r
-  USED block at 188eee2c of size 20\r
-  USED block at 188eee40 of size 20\r
-  USED block at 188eee54 of size 4520\r
+  USED block at 190bec66 of size 12\r
+  USED block at 190bec72 of size 528\r
+  USED block at 190bee82 of size 72\r
+  USED block at 190beeca of size 20\r
+  USED block at 190beede of size 20\r
+  USED block at 190beef2 of size 20\r
+  USED block at 190bef06 of size 20\r
+  USED block at 190bef1a of size 20\r
+  USED block at 190bef2e of size 4302\r
 OK - end of heap\r
 \r
        == far ==\r
 \r
-  USED block at 288f0016 of size 136\r
-  USED block at 288f009e of size 68\r
-  USED block at 288f00e2 of size 50\r
-  USED block at 288f0114 of size 50\r
-  USED block at 288f0146 of size 50\r
-  USED block at 288f0178 of size 50\r
-  USED block at 288f01aa of size 50\r
-  USED block at 288f01dc of size 50\r
-  USED block at 288f020e of size 50\r
-  USED block at 288f0240 of size 50\r
-  USED block at 288f0272 of size 50\r
-  USED block at 288f02a4 of size 50\r
-  USED block at 288f02d6 of size 50\r
-  USED block at 288f0308 of size 50\r
-  USED block at 288f033a of size 14\r
-  USED block at 288f0348 of size 20\r
-  USED block at 288f035c of size 7328\r
+  USED block at 290c0016 of size 136\r
+  USED block at 290c009e of size 68\r
+  USED block at 290c00e2 of size 50\r
+  USED block at 290c0114 of size 50\r
+  USED block at 290c0146 of size 50\r
+  USED block at 290c0178 of size 50\r
+  USED block at 290c01aa of size 50\r
+  USED block at 290c01dc of size 50\r
+  USED block at 290c020e of size 50\r
+  USED block at 290c0240 of size 50\r
+  USED block at 290c0272 of size 50\r
+  USED block at 290c02a4 of size 50\r
+  USED block at 290c02d6 of size 50\r
+  USED block at 290c0308 of size 50\r
+  USED block at 290c033a of size 14\r
+  USED block at 290c0348 of size 20\r
+  USED block at 290c035c of size 7328\r
 OK - end of heap\r
 \r
 Memory Type         Total      Used       Free\r
 ----------------  --------   --------   --------\r
 Default                   8166         756       7410\r
-Near              5014         494       4520\r
+Near              5014         712       4302\r
 Far               8166         756       7410\r
 ----------------  --------   --------   --------\r
-coreleft = 4518\r
-farcoreleft = 28156\r
+coreleft = 4300\r
+farcoreleft = 27938\r
 GetFreeSize = 23660\r
-GetNearFreeSize = 4520\r
+GetNearFreeSize = 4302\r
 GetFarFreeSize = 23660\r
-memavl = 4518\r
-stackavail = 31529\r
+memavl = 4300\r
+stackavail = 31539\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
index 72c45a4eaa8b0423f70fa41071b91419c3cb7d8b..dc4963758caaeb8e0337b2d7bf155ac119199d99 100755 (executable)
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ

diff --git a/lq.sh b/lq.sh
new file mode 100755 (executable)
index 0000000..6f87828
--- /dev/null
+++ b/lq.sh
@@ -0,0 +1 @@
+grep -i "$1" src/lib/*

diff --git a/makefile b/makefile
index ab1dc97b92fee5d8526e716b0aa018db7664e673..d754f9572cecf5cee771c5168ca2fb929cbf373a 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -396,6 +396,7 @@ mkdl: .symbolic
 cldl: .symbolic
        @cd $(DOSLIB:$(to_os_path))
        @$(DOSLIBMAKEALL) $(DOSLIB_MEMMODE) clean
+       @$(REMOVECOMMAND) -rf ext/README
        @cd $(BUILD_ROOT)
 
 uplibs: .symbolic
@@ -419,10 +420,8 @@ initlibs: .symbolic
        @$(COPYCOMMAND) git_con.fig .git/config
        @$(COPYCOMMAND) git_modu.les .gitmodules
        @$(COPYCOMMAND) git_igno.re .gitignore
-       @cd $(SRCLIB:$(to_os_path))
-       @git clone https://github.com/joncampbell123/doslib.git
-       @git clone https://github.com/zserge/jsmn.git
-       @cd $(BUILD_ROOT)
+       @wmake -h cldl
+       @wmake -h jmdl
        @cd 16
        @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git
        @git clone https://github.com/id-Software/wolf3d.git
@@ -431,6 +430,16 @@ initlibs: .symbolic
        @cd $(BUILD_ROOT)
        @$(COPYCOMMAND) $(DOSLIB)/make-lowercase .
 
+dlcl: .symbolic
+       @cd $(SRCLIB:$(to_os_path))
+       @git clone https://github.com/joncampbell123/doslib.git
+       @cd $(BUILD_ROOT)
+
+jmcl: .symbolic
+       @cd $(SRCLIB:$(to_os_path))
+       @git clone https://github.com/zserge/jsmn.git
+       @cd $(BUILD_ROOT)
+
 ##
 ##     experimental libs
 ##

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 61838010e59eee4de606050e7d5df7b6ef7f431a..8b9aab83be9c2ccb1d922938dfe50657ce47b2a9 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -221,7 +221,7 @@ void CAL_GetGrChunkLength (int chunk)
 ==========================\r
 */\r
 \r
-boolean CA_FarRead(int handle, byte huge *dest, dword length, global_game_variables_t *gvar)\r
+boolean CA_FarRead(int handle, byte far *dest, dword length, global_game_variables_t *gvar)\r
 {\r
        boolean flag=0;\r
        //dword fat=0;\r
@@ -293,7 +293,7 @@ End:
 ==========================\r
 */\r
 \r
-boolean CA_FarWrite(int handle, byte huge *source, dword length, global_game_variables_t *gvar)\r
+boolean CA_FarWrite(int handle, byte far *source, dword length, global_game_variables_t *gvar)\r
 {\r
        boolean flag=0;\r
        //dword fat=0;\r
@@ -498,7 +498,7 @@ void CAL_OptimizeNodes(huffnode *table)
 ======================\r
 */\r
 \r
-void CAL_HuffExpand (byte huge *source, byte huge *dest,\r
+void CAL_HuffExpand (byte far *source, byte far *dest,\r
   long length,huffnode *hufftable)\r
 {\r
 //  unsigned bit,byte,node,code;\r
@@ -795,12 +795,12 @@ void CAL_CarmackExpand (unsigned far *source, unsigned far *dest, unsigned lengt
 ======================\r
 */\r
 \r
-long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,\r
+long CA_RLEWCompress (unsigned far *source, long length, unsigned far *dest,\r
   unsigned rlewtag)\r
 {\r
   long complength;\r
   unsigned value,count,i;\r
-  unsigned huge *start,huge *end;\r
+  unsigned far *start,far *end;\r
 \r
   start = dest;\r
 \r
@@ -852,11 +852,11 @@ long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,
 ======================\r
 */\r
 \r
-void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,\r
+void CA_RLEWexpand (unsigned far *source, unsigned far *dest,long length,\r
   unsigned rlewtag)\r
 {\r
 //  unsigned value,count,i;\r
-  unsigned huge *end;\r
+  unsigned far *end;\r
   unsigned sourceseg,sourceoff,destseg,destoff,endseg,endoff;\r
 \r
 \r
@@ -1065,7 +1065,7 @@ dinorm:
        CAL_GetGrChunkLength(STRUCTPIC);                // position file pointer\r
        MM_GetPtr(&compseg,chunkcomplen);\r
        CA_FarRead (grhandle,compseg,chunkcomplen);\r
-       CAL_HuffExpand (compseg, (byte huge *)pictable,NUMPICS*sizeof(pictabletype),grhuffman);\r
+       CAL_HuffExpand (compseg, (byte far *)pictable,NUMPICS*sizeof(pictabletype),grhuffman);\r
        MM_FreePtr(&compseg);\r
 #endif\r
 \r
@@ -1074,7 +1074,7 @@ dinorm:
        CAL_GetGrChunkLength(STRUCTPICM);               // position file pointer\r
        MM_GetPtr(&compseg,chunkcomplen);\r
        CA_FarRead (grhandle,compseg,chunkcomplen);\r
-       CAL_HuffExpand (compseg, (byte huge *)picmtable,NUMPICS*sizeof(pictabletype),grhuffman);\r
+       CAL_HuffExpand (compseg, (byte far *)picmtable,NUMPICS*sizeof(pictabletype),grhuffman);\r
        MM_FreePtr(&compseg);\r
 #endif\r
 \r
@@ -1083,7 +1083,7 @@ dinorm:
        CAL_GetGrChunkLength(STRUCTSPRITE);     // position file pointer\r
        MM_GetPtr(&compseg,chunkcomplen);\r
        CA_FarRead (grhandle,compseg,chunkcomplen);\r
-       CAL_HuffExpand (compseg, (byte huge *)spritetable,NUMSPRITES*sizeof(spritetabletype),grhuffman);\r
+       CAL_HuffExpand (compseg, (byte far *)spritetable,NUMSPRITES*sizeof(spritetabletype),grhuffman);\r
        MM_FreePtr(&compseg);\r
 #endif\r
 \r

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index 203cce952e68cb17cbebade6f560ebc24339c976..471a4517de1b5e5f2b04a5bb83b479b74f630ab5 100755 (executable)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -90,16 +90,16 @@ extern      void    (*finishcachebox)       (void);
 \r
 void CA_OpenDebug (global_game_variables_t *gvar);\r
 void CA_CloseDebug (global_game_variables_t *gvar);\r
-boolean CA_FarRead (int handle, byte huge *dest, dword length, global_game_variables_t *gvar);\r
-boolean CA_FarWrite (int handle, byte huge *source, dword length, global_game_variables_t *gvar);\r
+boolean CA_FarRead (int handle, byte far *dest, dword length, global_game_variables_t *gvar);\r
+boolean CA_FarWrite (int handle, byte far *source, dword length, global_game_variables_t *gvar);\r
 \r
 boolean CA_ReadFile (char *filename, memptr *ptr, global_game_variables_t *gvar);\r
 boolean CA_WriteFile (char *filename, void far *ptr, long length, global_game_variables_t *gvar);\r
 boolean CA_LoadFile (char *filename, memptr *ptr, global_game_variables_t *gvar);\r
 \r
-long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);\r
+long CA_RLEWCompress (unsigned far *source, long length, unsigned far *dest,unsigned rlewtag);\r
 \r
-void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag);\r
+void CA_RLEWexpand (unsigned far *source, unsigned far *dest,long length,unsigned rlewtag);\r
 \r
 void CA_Startup (global_game_variables_t *gvar);\r
 void CA_Shutdown (global_game_variables_t *gvar);\r

diff --git a/src/lib/16_dbg.c b/src/lib/16_dbg.c
index 7f34624b630ade752c5db9030aae8ed523ee58d9..d7b14159abb88a89ddd73fd5daa2dc775e6dd605 100755 (executable)
--- a/src/lib/16_dbg.c
+++ b/src/lib/16_dbg.c
@@ -1,13 +1,11 @@
 #include "src/lib/16_dbg.h"\r
-//#include "src/16.h"\r
-\r
 \r
 #ifdef __DEBUG__\r
 #ifdef __DEBUG_PM__\r
 boolean dbg_debugpm=0;\r
 #endif\r
 #ifdef __DEBUG_InputMgr__\r
-boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0;\r
+boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0,dbg_notest=0;\r
 #endif\r
 #endif\r
 \r

diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
index 06c3fccf07f87b9e061914129fcdcc3f02f904ec..ddec1684015177eebe9f211f442f21a0a9962455 100755 (executable)
--- a/src/lib/16_dbg.h
+++ b/src/lib/16_dbg.h
@@ -16,7 +16,7 @@
 extern boolean dbg_debugpm;\r
 #endif\r
 #ifdef __DEBUG_InputMgr__\r
-extern boolean dbg_testkeyin,dbg_testcontrolnoisy;\r
+extern boolean dbg_testkeyin,dbg_testcontrolnoisy,dbg_notest;\r
 #endif\r
 #endif\r
 \r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 9adfe42abd8c0fed0667e4fc93df8c213e91d6db..3b7584ac8be07b7cebf8fb322777f30cdd622dc5 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -1247,7 +1247,13 @@ IN_UserInput(dword delay,boolean clear)
 \r
 boolean IN_KeyDown(byte code)\r
 {\r
+#ifdef __DEBUG_InputMgr__\r
+       if(!dbg_notest)\r
+#endif\r
        return inpu.Keyboard[code];\r
+#ifdef __DEBUG_InputMgr__\r
+       else return kbhit();\r
+#endif\r
 }\r
 \r
 void IN_ClearKey(byte code)\r
@@ -1260,7 +1266,7 @@ void IN_ClearKey(byte code)
 boolean IN_qb(byte kee)\r
 {\r
 #ifdef __DEBUG_InputMgr__\r
-//     if(dbg_testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);\r
+       if(dbg_testkeyin) printf("%u\n", inpu.Keyboard[kee]);\r
 #endif\r
        if(inpu.Keyboard[kee]==true) return 1;\r
        else return 0;\r

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 512a81aff3a0b4400f1b19d81da55b7a41834b7d..103ff76369a2cefec8ebf918320f9bb86eac0860 100755 (executable)
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -38,8 +38,8 @@
 \r
 //TODO: 16_mm and 16_ca must handle this\r
 typedef struct {\r
-       bitmap_t huge *btdata;          //old\r
-       planar_buf_t huge *data;        //old\r
+       bitmap_t far *btdata;           //old\r
+       planar_buf_t far *data; //old\r
        word tileHeight, tileWidth;\r
        unsigned int rows, cols;\r
        #ifdef __DEBUG__\r
@@ -54,9 +54,9 @@ typedef struct {
        //long          planestart[3];\r
        //unsigned      planelength[3];\r
        byte *data;                     //TODO: 16_mm and 16_ca must handle this\r
-       byte * huge *layerdata; //TODO: 16_mm and 16_ca must handle this\r
+       byte * far *layerdata;  //TODO: 16_mm and 16_ca must handle this\r
        tiles_t *tiles;         //TODO: 16_mm and 16_ca must handle this\r
-       tiles_t * huge *layertile;      //TODO: 16_mm and 16_ca must handle this\r
+       tiles_t * far *layertile;       //TODO: 16_mm and 16_ca must handle this\r
        int width, height;              //this has to be signed!\r
        char            name[16];\r
 } map_t;\r

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 98d0c43fa978f3ac5ce926e2f1f94625a102f6c6..f894464ea91d6ce0cd70496f4570fcf1f5db135f 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -563,7 +563,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
 
 /*void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan,huge *last;
+       mmblocktype far *scan,far *last;
        word            segm=1;
        word    oldend;
        dword           segmlen;
@@ -716,8 +716,7 @@ void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
 
 void MML_ClearBlock(global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan,huge *last;
-       mmblocktype __far *scan;//,far *last;
+       mmblocktype far *scan;//,far *last;
 
        scan = gvar->mm.mmhead->next;
 
@@ -753,7 +752,6 @@ void MM_Startup(global_game_variables_t *gvar)
        int i;
        //dword length,seglength;
        dword length; word seglength;
-       //huge void huge        *start;
        void far        *start;
        word    segstart;//,endfree;
 
@@ -789,12 +787,10 @@ void MM_Startup(global_game_variables_t *gvar)
 #ifdef __WATCOMC__
        _nheapgrow();
        length=(dword)_memavl();//(dword)GetFreeSize();
-       //huge start = (void huge *)(gvar->mm.nearheap = _nmalloc(length));
        start = (void far *)(gvar->mm.nearheap = _nmalloc(length));
 #endif
 #ifdef __BORLANDC__
        length=coreleft();
-       //huge start = (void huge *)(gvar->mm.nearheap = malloc(length));
        start = (void far *)(gvar->mm.nearheap = malloc(length));
 #endif
        length -= 16-(FP_OFF(start)&15);
@@ -930,7 +926,6 @@ void MM_Shutdown(global_game_variables_t *gvar)
 
 void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan,huge *lastscan,huge *endscan,huge *purge,huge *next;
        mmblocktype far *scan,far *lastscan,far *endscan,far *purge,far *next;
        int                     search;
        unsigned        needed,startseg;
@@ -1049,7 +1044,6 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
 
 void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan,huge *last;
        mmblocktype far *scan,far *last;
 
        last = gvar->mm.mmhead;
@@ -1089,7 +1083,6 @@ void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar)
 
 void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *start;
        mmblocktype far *start;
 
        start = gvar->mm.mmrover;
@@ -1129,7 +1122,6 @@ void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar)
 
 void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *start;
        mmblocktype far *start;
 
        start = gvar->mm.mmrover;
@@ -1169,7 +1161,6 @@ void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar)
 
 void MM_SortMem(global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan,huge *last,huge *next;
        mmblocktype far *scan,far *last,far *next;
        unsigned        start,length,source,dest;//++++,oldborder;
        //++++int                       playing;
@@ -1280,7 +1271,6 @@ void MM_SortMem(global_game_variables_t *gvar)
 
 void MM_ShowMemory(global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan;
        mmblocktype far *scan;
        //word temp;
        sdword  end,owner;
@@ -1443,7 +1433,6 @@ void MM_ShowMemory(global_game_variables_t *gvar)
 
 void MM_DumpData(global_game_variables_t *gvar)
 {
-       //huge mmblocktype huge *scan,huge *best;
        mmblocktype far *scan,far *best;
        long    lowest,oldlowest;
        word    owner;
@@ -1518,7 +1507,6 @@ void MM_DumpData(global_game_variables_t *gvar)
 dword MM_UnusedMemory(global_game_variables_t *gvar)
 {
        dword free;
-       //huge mmblocktype huge *scan;
        mmblocktype far *scan;
 
        free = 0;
@@ -1550,7 +1538,6 @@ dword MM_UnusedMemory(global_game_variables_t *gvar)
 dword MM_TotalFree(global_game_variables_t *gvar)
 {
        dword free;
-       //huge mmblocktype huge *scan;
        mmblocktype far *scan;
 
        free = 0;

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index b160ac6515b40662358a553f897e5f2371d8f5c7..abcf48aa05720451433f95e3354484c88b18da82 100755 (executable)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -136,7 +136,6 @@ extern      word            XMSVer;
        word    blob;   //for data larger than 64k\r
        unsigned        attributes;\r
        memptr          *useptr;        // pointer to the segment start\r
-       //huge struct mmblockstruct huge *next;\r
        struct mmblockstruct far *next;\r
 } mmblocktype;\r
 \r
@@ -145,7 +144,6 @@ typedef struct
 {\r
        memptr bufferseg;\r
        boolean         mmstarted, bombonerror, mmerror;\r
-       //huge void huge        *farheap;\r
        void far        *farheap;\r
 #ifdef __BORLANDC__\r
        void    *nearheap;\r
@@ -158,7 +156,6 @@ typedef struct
        unsigned int EMSVer;\r
        word numUMBs,UMBbase[MAXUMBS];\r
        //dword numUMBs,UMBbase[MAXUMBS];\r
-       //huge mmblocktype      huge mmblocks[MAXBLOCKS],huge *mmhead,huge *mmfree,huge *mmrover,huge *mmnew;\r
        mmblocktype     far mmblocks[MAXBLOCKS],far *mmhead,far *mmfree,far *mmrover,far *mmnew;\r
 } mminfo_t;*/\r
 \r

diff --git a/src/lib/16_sprit.c b/src/lib/16_sprit.c
index d4daf597a8195dfd157c4d09afa9f8e490ab5502..3bfd3f1c7619b98f1977abe48ace52375c9c893a 100755 (executable)
--- a/src/lib/16_sprit.c
+++ b/src/lib/16_sprit.c
@@ -25,9 +25,9 @@
 char* get_curr_anim_name(struct sprite *spri)\r
 {\r
        // Retrive animation name list\r
-       struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;\r
-       uint32_t huge *anim_names_offsets =     (uint32_t huge *)\r
-                                               ((byte huge *)vrs +\r
+       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
+       uint32_t far *anim_names_offsets =      (uint32_t far *)\r
+                                               ((byte far *)vrs +\r
                                                 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_NAME_LIST]);\r
 \r
        return (char *)(vrs + anim_names_offsets[spri->curr_anim]);\r
@@ -35,12 +35,12 @@ char* get_curr_anim_name(struct sprite *spri)
 \r
 void init_anim(struct sprite *spri, int anim_index)\r
 {\r
-       struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;\r
-       uint32_t huge *anim_lists_offsets =     (uint32_t huge *)\r
-                                               ((byte huge *)vrs +\r
+       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
+       uint32_t far *anim_lists_offsets =      (uint32_t far *)\r
+                                               ((byte far *)vrs +\r
                                                 vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_LIST]);\r
-       struct vrs_animation_list_entry_t huge *anim_list =     (struct vrs_animation_list_entry_t huge *)\r
-                                                               ((byte huge *)vrs +\r
+       struct vrs_animation_list_entry_t far *anim_list =      (struct vrs_animation_list_entry_t far *)\r
+                                                               ((byte far *)vrs +\r
                                                                 anim_lists_offsets[anim_index]);\r
 \r
        // Upon new animation, start from the first sprite in it\r
@@ -57,10 +57,10 @@ int set_anim_by_id(struct sprite *spri, int anim_id)
 {\r
        int new_anim_index = 0;\r
        int iter_id;\r
-       struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;\r
+       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
        // Retruve animation ids list\r
-        uint16_t huge *anim_ids =      (uint16_t huge *)\r
-                                       ((byte huge *)vrs +\r
+        uint16_t far *anim_ids =       (uint16_t far *)\r
+                                       ((byte far *)vrs +\r
                                         vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_ID_LIST]);\r
 \r
        // Loop through animation id untill match or end of list\r
@@ -81,10 +81,10 @@ void print_anim_ids(struct sprite *spri)
 {\r
        int new_anim_index = 0;\r
        int iter_id;\r
-       struct vrs_header huge *vrs = spri->spritesheet->vrs_hdr;\r
+       struct vrs_header far *vrs = spri->spritesheet->vrs_hdr;\r
        // Retruve animation ids list\r
-        uint16_t huge *anim_ids =      (uint16_t huge *)\r
-                                       ((byte huge *)vrs +\r
+        uint16_t far *anim_ids =       (uint16_t far *)\r
+                                       ((byte far *)vrs +\r
                                         vrs->offset_table[VRS_HEADER_OFFSET_ANIMATION_ID_LIST]);\r
 \r
        if(!anim_ids[new_anim_index])\r
@@ -98,7 +98,7 @@ void print_anim_ids(struct sprite *spri)
 }\r
 \r
 \r
-void animate_spri(struct sprite *spri)\r
+void animate_spri(struct sprite *spri, global_game_variables_t *gvar)\r
 {\r
        int i;\r
        // Events go here\r
@@ -107,8 +107,7 @@ void animate_spri(struct sprite *spri)
        i = get_vrl_by_id(spri->spritesheet, spri->curr_spri_id, spri->sprite_vrl_cont);\r
        if(i < 0)\r
        {\r
-               printf("Error retriving required sprite");\r
-               exit(-1);\r
+               Quit (gvar, "Error retriving required sprite");\r
        }\r
        draw_vrl1_vgax_modex(   spri->x, spri->y,\r
                                spri->sprite_vrl_cont->vrl_header, spri->sprite_vrl_cont->line_offsets,\r

diff --git a/src/lib/16_sprit.h b/src/lib/16_sprit.h
index 107cb3e5e3015a2739220c31a819305b5896b0f1..9ef500e5d0d76e0a554e6e64df84182fd4e7ceff 100755 (executable)
--- a/src/lib/16_sprit.h
+++ b/src/lib/16_sprit.h
@@ -66,7 +66,7 @@ int set_anim_by_id(struct sprite *spri, int id);
  * In:\r
  * + struct sprite *spri - sprite to animate\r
  */\r
-void animate_spri(struct sprite *spri);\r
+void animate_spri(struct sprite *spri, global_game_variables_t *gvar);\r
 \r
 void print_anim_ids(struct sprite *spri);\r
 \r

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index b64d2ff5305c6cd91b1868fe0c09034ccaf7c4d1..d7a86f56e9a5f8b981c2a75575c0051ed8138482 100755 (executable)
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -76,6 +76,9 @@ void Startup16(global_game_variables_t *gvar)
        gvar->pm.PMStarted=0;\r
        MM_Startup(gvar);\r
 #ifdef __WATCOMC__\r
+#ifdef __DEBUG_InputMgr__\r
+       if(!dbg_notest)\r
+#endif\r
        IN_Startup(gvar);\r
 #endif\r
        PM_Startup(gvar);\r
@@ -99,6 +102,9 @@ void Shutdown16(global_game_variables_t *gvar)
 {\r
        PM_Shutdown(gvar);\r
 #ifdef __WATCOMC__\r
+#ifdef __DEBUG_InputMgr__\r
+       if(!dbg_notest)\r
+#endif\r
        IN_Shutdown(gvar);\r
 #endif\r
        CA_Shutdown(gvar);\r

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index d8a43bf545d906dfb2055d1a24db5807f1fdf714..f77119af4af5291b5067ed81d4ee0dd987f8dd02 100755 (executable)
--- a/src/lib/16_vrs.c
+++ b/src/lib/16_vrs.c
@@ -25,13 +25,13 @@
 int read_vrs(global_game_variables_t *gvar, char *filename, struct vrs_container *vrs_cont){\r
        int fd;\r
        dword size;\r
-       byte huge *buffer;\r
+       byte far *buffer;\r
        vrl1_vgax_offset_t **vrl_line_offsets;\r
-       uint32_t huge *vrl_headers_offsets;\r
-       uint16_t huge *vrl_id_iter;\r
+       uint32_t far *vrl_headers_offsets;\r
+       uint16_t far *vrl_id_iter;\r
        uint32_t vrl_size;\r
        int num_of_vrl=0, i;\r
-       struct vrl1_vgax_header huge *curr_vrl;\r
+       struct vrl1_vgax_header far *curr_vrl;\r
        int success=1;\r
 \r
        // Open filename, get size of file,\r
@@ -54,17 +54,17 @@ int read_vrs(global_game_variables_t *gvar, char *filename, struct vrs_container
        // Calculate vrl offsets\r
 \r
        // Count sprites\r
-       vrl_id_iter = (uint16_t huge *)(buffer + vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
+       vrl_id_iter = (uint16_t far *)(buffer + vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
        while(vrl_id_iter[num_of_vrl]){\r
                num_of_vrl++;\r
        }\r
        // Allocate memory for vrl line offsets table\r
        vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);\r
 \r
-       vrl_headers_offsets = (uint32_t huge *)(buffer + vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
+       vrl_headers_offsets = (uint32_t far *)(buffer + vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
        // Calculate line offsets for each vrl\r
        for(i = 0; i < num_of_vrl; i++){\r
-               curr_vrl = (struct vrl1_vgax_header huge *)(buffer + vrl_headers_offsets[i]);\r
+               curr_vrl = (struct vrl1_vgax_header far *)(buffer + vrl_headers_offsets[i]);\r
 \r
                // Calc. vrl size as (next_offset - curr_offset)\r
                if (i != num_of_vrl - 1){\r
@@ -81,9 +81,9 @@ int read_vrs(global_game_variables_t *gvar, char *filename, struct vrs_container
 }\r
 \r
 // Seek and return a specified .vrl blob from .vrs blob in far memory\r
-int get_vrl_by_id(struct vrs_container /*huge*/ *vrs_cont, uint16_t id, struct vrl_container *vrl_cont){\r
-       uint16_t huge *ids;\r
-       uint32_t huge *vrl_offs_list;\r
+int get_vrl_by_id(struct vrs_container far *vrs_cont, uint16_t id, struct vrl_container *vrl_cont){\r
+       uint16_t far *ids;\r
+       uint32_t far *vrl_offs_list;\r
        int counter = 0;\r
 \r
        // If id is invalid, return -1\r
@@ -93,7 +93,7 @@ int get_vrl_by_id(struct vrs_container /*huge*/ *vrs_cont, uint16_t id, struct v
        }\r
 \r
        // Get id list from .vrs blob (base + offset)\r
-       ids = (uint16_t huge*)(vrs_cont->buffer +\r
+       ids = (uint16_t far*)(vrs_cont->buffer +\r
                vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
 \r
        // Loop through the id list until we found the right one or hit the end of the list\r
@@ -108,12 +108,12 @@ int get_vrl_by_id(struct vrs_container /*huge*/ *vrs_cont, uint16_t id, struct v
        }\r
 \r
        // Get vrl offsets list from .vrs blob (base + offset)\r
-       vrl_offs_list = (uint32_t huge *)(vrs_cont->buffer +\r
+       vrl_offs_list = (uint32_t far *)(vrs_cont->buffer +\r
                                        vrs_cont->vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
 \r
        // Get vrl_header from .vrs (base + offset from vrl_list)\r
        // Counter is number of vrls to skip (ids and vrls are aligned according to the .vrs specification)\r
-       vrl_cont->vrl_header = (struct vrl1_vgax_header huge *)(vrs_cont->buffer + vrl_offs_list[counter]);\r
+       vrl_cont->vrl_header = (struct vrl1_vgax_header far *)(vrs_cont->buffer + vrl_offs_list[counter]);\r
 \r
        // Get .vrl size by integer arithmetics (next vrl offset - current vrl offset)\r
        if(ids[counter+1]){\r

diff --git a/src/lib/16_vrs.h b/src/lib/16_vrs.h
index 49da2f6b8434754d5c7e6ef7a3eb73fbc108c0ff..054377b1dd63c1d95cd599acf34d23363670a5ec 100755 (executable)
--- a/src/lib/16_vrs.h
+++ b/src/lib/16_vrs.h
@@ -34,8 +34,8 @@ struct vrs_container{
        // minus header\r
        dword data_size;\r
        union{\r
-               byte huge *buffer;\r
-               struct vrs_header huge *vrs_hdr;\r
+               byte far *buffer;\r
+               struct vrs_header far *vrs_hdr;\r
        };\r
        // Array of corresponding vrl line offsets\r
        vrl1_vgax_offset_t **vrl_line_offsets;\r
@@ -46,8 +46,8 @@ struct vrl_container{
        // minus header\r
        dword data_size;\r
        union{\r
-               byte huge *buffer;\r
-               struct vrl1_vgax_header huge *vrl_header;\r
+               byte far *buffer;\r
+               struct vrl1_vgax_header far *vrl_header;\r
        };\r
        // Pointer to a corresponding vrl line offsets struct\r
        vrl1_vgax_offset_t *line_offsets;\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 4970401064ed7de41b406dfad32c7095ae1cbfab..912a29296248429f341b4727b441fb36c3e823a5 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 4970401064ed7de41b406dfad32c7095ae1cbfab
+Subproject commit 912a29296248429f341b4727b441fb36c3e823a5

diff --git a/src/scroll.c b/src/scroll.c
index 00c672ca3913cdeddefb5edf0066d96eaf63a0e3..131b043518b09e7a447c433704c8ee603b606263 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -30,7 +30,6 @@
 \r
 //bitmap_t p;\r
 static map_t map;\r
-player_t player[MaxPlayers];\r
 map_view_t mv[4];\r
 //word pn=0; //i forgot ww\r
 float t;\r
@@ -56,6 +55,7 @@ boolean panswitch=0;//1
 void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
+       static player_t player[MaxPlayers];\r
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r

diff --git a/src/vrstest.c b/src/vrstest.c
index d0e2b411778f13f79905607c99ea391486b6cc56..03220799f07187d5efd484ca62581a00f260089a 100755 (executable)
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -21,13 +21,15 @@
  */\r
 \r
 #include "src/lib/16_head.h"\r
+#include "src/lib/16_tail.h"\r
 #include "src/lib/16_vl.h"\r
 #include "src/lib/16_sprit.h"\r
-#include "src/lib/16_tail.h"\r
 #include "src/lib/16_pm.h"\r
-#include "src/lib/16_ca.h"\r
+//#include "src/lib/16_ca.h"\r
 #include "src/lib/16_mm.h"\r
 \r
+extern boolean dbg_notest;\r
+\r
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
 void main() {\r
@@ -44,12 +46,13 @@ void main() {
        //vrl1_vgax_offset_t * off, *off1;\r
        struct vrs_container vrs;\r
        vrl1_vgax_offset_t **vrl_line_offsets;\r
-       uint32_t huge *vrl_headers_offsets;\r
-       uint16_t huge *vrl_id_iter;\r
+       uint32_t far *vrl_headers_offsets;\r
+       uint16_t far *vrl_id_iter;\r
        uint32_t vrl_size;\r
        int num_of_vrl;\r
-       struct vrl1_vgax_header huge *curr_vrl;\r
+       struct vrl1_vgax_header far *curr_vrl;\r
        word w=0;\r
+       dbg_notest=1;\r
 \r
        Startup16(&gvar);\r
 \r
@@ -62,7 +65,7 @@ void main() {
        vrs.buffer = bigbuffer;\r
        vrs.data_size = size - sizeof(struct vrl1_vgax_header);\r
        num_of_vrl = 0;\r
-       vrl_id_iter = (uint16_t huge *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
+       vrl_id_iter = (uint16_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);\r
        while(vrl_id_iter[num_of_vrl]){\r
                num_of_vrl++;\r
        }\r
@@ -70,10 +73,10 @@ void main() {
        // Allocate memory for vrl line offsets table\r
        vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);\r
 \r
-       vrl_headers_offsets = (uint32_t huge *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
+       vrl_headers_offsets = (uint32_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
        // Calculate line offsets for each vrl\r
        for(i = 0; i < num_of_vrl; i++){\r
-               curr_vrl = (struct vrl1_vgax_header huge *)(vrs.buffer + vrl_headers_offsets[i]);\r
+               curr_vrl = (struct vrl1_vgax_header far *)(vrs.buffer + vrl_headers_offsets[i]);\r
 \r
                // Calc. vrl size as (next_offset - curr_offset)\r
                if (i != num_of_vrl - 1){\r
@@ -119,7 +122,7 @@ void main() {
        /*modexLoadPalFile("data/spri/chikyuu.pal", &pal);\r
        modexPalUpdate1(pal);*/\r
        for (i = 0; i < 5; i++){\r
-       spri.delay = 1; animate_spri(&spri); spri.x += 20; /*sleep(1);*/ }\r
+       spri.delay = 1; animate_spri(&spri, &gvar); spri.x += 20; /*sleep(1);*/ }\r
 \r
        while(!IN_KeyDown(sc_Escape))\r
        {\r

diff --git a/src/zcroll.c b/src/zcroll.c
index 90c72add6a38a7315976189a7deb253faf4796f5..29f329c89b1264b1381755b807a90a4c9c5ad745 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -30,7 +30,6 @@
 \r
 //bitmap_t p;\r
 static map_t map;\r
-player_t player[MaxPlayers];\r
 map_view_t mv[4];\r
 float t;\r
 sword bakapee;\r
@@ -55,12 +54,17 @@ memptr pal;
 void main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
+       static player_t player[MaxPlayers];\r
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
 \r
+       player[0].data = _fmalloc(72*128); //TODO use exmm\r
+       *player[0].data = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite\r
+\r
        Startup16(&gvar);\r
 \r
        pan.pn=0;\r
+\r
        // OK, this one takes hellova time and needs to be done in farmalloc or MM_...\r
        //IN CA i think you use CAL_SetupGrFile but i do think we should work together on this part --sparky4\r
        player[0].ent = malloc(sizeof(entity_t));\r
@@ -76,8 +80,8 @@ void main(int argc, char *argv[])
 \r
        // data\r
        read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].ent->spri->spritesheet);\r
-       player[0].data = malloc(72*128); //TODO use exmm\r
-       *player[0].data = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite\r
+//     player[0].data = malloc(72*128); //TODO use exmm\r
+//     *player[0].data = bitmapLoadPcx("data/chikyuu.pcx", &gvar); // load sprite\r
 \r
        //      input!\r
        IN_Default(0, &player,ctrl_Keyboard1);\r
@@ -145,6 +149,7 @@ void main(int argc, char *argv[])
 #ifdef FADE\r
        modexFadeOn(4, gpal);\r
 #endif\r
+       modexDrawSprite(mv[0].page, 16, 16, (player[0].data));\r
        /*strcpy(global_temp_status_text, "press enter for the loop of zcroll\nescape to quit");\r
        modexprint(&gvar.video.page[0], 144, 72, 1, 7, 0, global_temp_status_text);\r
        while(!IN_KeyDown(sc_Enter)){ if(IN_KeyDown(sc_Escape)) goto quit; } IN_UserInput(1,1);*///wwww\r
@@ -226,7 +231,6 @@ void main(int argc, char *argv[])
 \r
        /* fade back to text mode */\r
        /* but 1st lets save the game palette~ */\r
-       //quit:\r
 #ifdef FADE\r
        modexPalSave(gpal);\r
        modexSavePalFile("data/g.pal", gpal);\r