pee

diff --git a/DEBUG.16B b/DEBUG.16B
new file mode 100755 (executable)
index 0000000..ccae1ef
--- /dev/null
+++ b/DEBUG.16B
@@ -0,0 +1,209 @@
+\e[0mSeg:0      Size:5739       Owner:0x0\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[0mSeg:166b       Size:256        Owner:0x764d\r
+\e[44;34m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:176b       Size:256        Owner:0x341a\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:186b       Size:256        Owner:0x341c\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:196b       Size:256        Owner:0x341e\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:1a6b       Size:256        Owner:0x3420\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:1b6b       Size:256        Owner:0x3422\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:1c6b       Size:256        Owner:0x3424\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:1d6b       Size:256        Owner:0x3426\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:1e6b       Size:256        Owner:0x3428\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:1f6b       Size:256        Owner:0x342a\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:206b       Size:256        Owner:0x342c\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:216b       Size:256        Owner:0x342e\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:226b       Size:256        Owner:0x3430\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:236b       Size:256        Owner:0x3432\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:246b       Size:256        Owner:0x3434\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:256b       Size:256        Owner:0x3436\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:266b       Size:256        Owner:0x3438\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:276b       Size:256        Owner:0x343a\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:286b       Size:256        Owner:0x343c\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:296b       Size:256        Owner:0x343e\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:2a6b       Size:256        Owner:0x3440\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:2b6b       Size:256        Owner:0x3442\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:2c6b       Size:256        Owner:0x3444\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:2d6b       Size:256        Owner:0x3446\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:2e6b       Size:256        Owner:0x3448\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:2f6b       Size:256        Owner:0x344a\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:306b       Size:256        Owner:0x344c\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:316b       Size:256        Owner:0x344e\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:326b       Size:256        Owner:0x3450\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:336b       Size:256        Owner:0x3452\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:346b       Size:256        Owner:0x3454\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:356b       Size:256        Owner:0x3456\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:366b       Size:256        Owner:0x3458\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:376b       Size:256        Owner:0x345a\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:386b       Size:256        Owner:0x345c\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:396b       Size:256        Owner:0x345e\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:3a6b       Size:256        Owner:0x3460\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:3b6b       Size:256        Owner:0x3462\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:3c6b       Size:256        Owner:0x3464\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:3d6b       Size:256        Owner:0x3466\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:3e6b       Size:256        Owner:0x3468\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:3f6b       Size:256        Owner:0x346a\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:406b       Size:256        Owner:0x346c\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:416b       Size:256        Owner:0x346e\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:426b       Size:256        Owner:0x3470\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:436b       Size:256        Owner:0x3472\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:446b       Size:256        Owner:0x3474\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:456b       Size:256        Owner:0x3476\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:466b       Size:256        Owner:0x3478\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:476b       Size:256        Owner:0x347a\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:486b       Size:256        Owner:0x347c\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:496b       Size:256        Owner:0x347e\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:4a6b       Size:256        Owner:0x3480\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:4b6b       Size:256        Owner:0x3482\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:4c6b       Size:256        Owner:0x3484\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:4d6b       Size:256        Owner:0x3486\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:4e6b       Size:256        Owner:0x3488\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:4f6b       Size:256        Owner:0x348a\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:506b       Size:256        Owner:0x348c\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:516b       Size:256        Owner:0x348e\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:526b       Size:256        Owner:0x3490\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:536b       Size:256        Owner:0x3492\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:546b       Size:256        Owner:0x3494\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:556b       Size:256        Owner:0x3496\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:566b       Size:256        Owner:0x3498\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:576b       Size:256        Owner:0x349a\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:586b       Size:256        Owner:0x349c\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:596b       Size:256        Owner:0x349e\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:5a6b       Size:256        Owner:0x34a0\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:5b6b       Size:256        Owner:0x34a2\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:5c6b       Size:256        Owner:0x34a4\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:5d6b       Size:256        Owner:0x34a6\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:5e6b       Size:256        Owner:0x34a8\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:5f6b       Size:256        Owner:0x34aa\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:606b       Size:256        Owner:0x34ac\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:616b       Size:256        Owner:0x34ae\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:626b       Size:256        Owner:0x34b0\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:636b       Size:256        Owner:0x34b2\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:646b       Size:256        Owner:0x34b4\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:656b       Size:256        Owner:0x34b6\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:666b       Size:256        Owner:0x34b8\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:676b       Size:256        Owner:0x34ba\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:686b       Size:256        Owner:0x34bc\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:696b       Size:256        Owner:0x34be\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:6a6b       Size:256        Owner:0x34c0\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:6b6b       Size:256        Owner:0x34c2\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:6c6b       Size:256        Owner:0x34c4\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:6d6b       Size:256        Owner:0x34c6\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:6e6b       Size:256        Owner:0x34c8\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:6f6b       Size:256        Owner:0x34ca\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:706b       Size:256        Owner:0x34cc\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:716b       Size:256        Owner:0x34ce\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:726b       Size:256        Owner:0x34d0\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:736b       Size:256        Owner:0x34d2\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:746b       Size:256        Owner:0x34d4\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:756b       Size:256        Owner:0x34d6\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:766b       Size:256        Owner:0x34d8\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:776b       Size:256        Owner:0x34da\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:786b       Size:256        Owner:0x34dc\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:796b       Size:256        Owner:0x34de\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:7a6b       Size:256        Owner:0x34e0\r
+\e[45;35m\e[0m\e[42;32m0\r
+\e[0m\e[0mSeg:7b6b       Size:273        Owner:0x764d\r
+\e[44;34m\e[0m\e[42;32m000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
+\e[0m\e[0mSeg:9fbe       Size:32834      Owner:0x0\r
+\e[41;31m\e[0m\e[42;32m000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
+\e[0m\e[0mSeg:9f3f       Size:24768      Owner:0x0\r
+\e[41;31m\e[0m
\ No newline at end of file

diff --git a/HEAP.16W b/HEAP.16W
deleted file mode 100755 (executable)
index e9f8489..0000000
--- a/HEAP.16W
+++ /dev/null
@@ -1,53 +0,0 @@
-\r
-       == near ==\r
-\r
-  USED block at 1e7f:fa16 of size 12\r
-  USED block at 1e7f:fa22 of size 320\r
-  USED block at 1e7f:fb62 of size 52\r
-  USED block at 1e7f:fb96 of size 20\r
-  USED block at 1e7f:fbaa of size 20\r
-  USED block at 1e7f:fbbe of size 20\r
-  USED block at 1e7f:fbd2 of size 20\r
-  USED block at 1e7f:fbe6 of size 20\r
-  FREE block at 1e7f:fbfa of size 1026\r
-OK - end of heap\r
-\r
-       == far ==\r
-\r
-  USED block at 2e80:0016 of size 4098\r
-  USED block at 2e80:1018 of size 20\r
-  USED block at 2e80:102c of size 66\r
-  USED block at 2e80:106e of size 50\r
-  USED block at 2e80:10a0 of size 50\r
-  USED block at 2e80:10d2 of size 50\r
-  USED block at 2e80:1104 of size 50\r
-  USED block at 2e80:1136 of size 50\r
-  USED block at 2e80:1168 of size 50\r
-  USED block at 2e80:119a of size 50\r
-  USED block at 2e80:11cc of size 50\r
-  USED block at 2e80:11fe of size 50\r
-  USED block at 2e80:1230 of size 50\r
-  USED block at 2e80:1262 of size 50\r
-  USED block at 2e80:1294 of size 50\r
-  FREE block at 2e80:12c6 of size 29552\r
-  USED block at 2e80:8636 of size 1202\r
-  USED block at 2e80:8ae8 of size 1202\r
-  USED block at 2e80:8f9a of size 1202\r
-  USED block at 2e80:944c of size 136\r
-  USED block at 2e80:94d4 of size 22\r
-  FREE block at 2e80:94ea of size 8202\r
-  FREE block at 2e80:b4f4 of size 0\r
-ERROR - bad node in heap\r
-\r
-Memory Type         Total      Used       Free\r
-----------------  --------   --------   --------\r
-Near              1510         484       1026\r
-Far               46302        8548      37754\r
-----------------  --------   --------   --------\r
-HC_coreleft = 1024\r
-HC_farcoreleft = 417792\r
-HC_GetFreeSize = 37754\r
-HC_GetNearFreeSize = 1026\r
-HC_GetFarFreeSize = 37754\r
-memavl = 1024\r
-stackavail = 31498\r

diff --git a/MMDUMP.16B b/MMDUMP.16B
new file mode 100755 (executable)
index 0000000..eeec0ce
Binary files /dev/null and b/MMDUMP.16B differ

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

diff --git a/bcexmm.dsk b/bcexmm.dsk
index 6ae999a4257ff69883db7fedb0e75e2c6de6f458..b0e92853079b7276eed67b1b486010191a5fa366 100755 (executable)
Binary files a/bcexmm.dsk and b/bcexmm.dsk differ

diff --git a/bcexmm.exe b/bcexmm.exe
index 80889851184c1a55a849e013505ce43cfb3754ff..ad0e6412b5e468bbc4ffaa9f780aae647630a4bc 100755 (executable)
Binary files a/bcexmm.exe and b/bcexmm.exe differ

diff --git a/bcexmm.prj b/bcexmm.prj
index 3da423e7ffefa136addbd91f6086607be492b550..c56c954c3457c8e7d3358ecfec58dd79f0bd9f3a 100755 (executable)
Binary files a/bcexmm.prj and b/bcexmm.prj differ

diff --git a/makefile b/makefile
index 8c815b01faab9fd0b2b97ec437f7357329e2fdaa..f9712f4278945969a5f9e3a2f16bbdfe906919e8 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -532,6 +532,7 @@ comq: .symbolic
 
 www: .symbolic
        @if exist 16.exe @wmake -s -h wwwdo
+       @if exist 16.exe @wmake -s -h wwwext
 
 wwwdo: .symbolic
        @for %f in (/var/www/$(EXEC)) do @if exist /var/www/%f $(REMOVECOMMAND) /var/www/%f
@@ -540,7 +541,6 @@ wwwdo: .symbolic
        @for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/
        @./src/util/z.sh $(EXEC) $(EXEC)
        @./src/util/z2.sh data.zip data
-       @wmake -s -h wwwext
 
 wwwext: .symbolic
        @wmake -s -h wwwext2

diff --git a/src/exmmtest.c b/src/exmmtest.c
index ea73aa996358518a0b7b5e279202d17271ea8579..3ab4e02e5b9d07495070ff9aad2ffd0e7346631c 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -50,6 +50,7 @@
 #endif\r
 #ifdef __WATCOMC__\r
 #define NOVID\r
+//#define                      SCROLLLOAD\r
 #endif\r
 \r
 \r
@@ -69,7 +70,6 @@
 #endif\r
 \r
 ////////////////////////////////////////////////////////////////////////////\r
-//#ifdef NOVID\r
 #ifdef __BORLANDC__\r
 void VL_Startup (global_game_variables_t *gvar){ gvar=gvar; }\r
 void VL_Shutdown (global_game_variables_t *gvar){ gvar=gvar; }\r
@@ -130,6 +130,14 @@ void segatesuto()
 }\r
 #endif\r
 \r
+#ifdef SCROLLLOAD\r
+#define FILENAME_1     "data/spri/chikyuu.vrs"\r
+#define FILENAME_2     "data/test.map"\r
+#else\r
+#define FILENAME_1     "data/koishi~.pcx"\r
+#define FILENAME_2     "data/test.map"\r
+#endif\r
+\r
 //===========================================================================//\r
 \r
 //=======================================//\r
@@ -140,18 +148,13 @@ void segatesuto()
 void\r
 main(int argc, char *argv[])\r
 {\r
-       byte w;\r
        static global_game_variables_t gvar;\r
                                                                #ifdef INITBBUF\r
        INITBBUF\r
                                                                #endif\r
-#if 0\r
-//#ifdef __WATCOMC__\r
-       __segment sega;\r
-#endif\r
-       char bakapee1[64] = "data/koishi~.pcx";\r
-       char bakapee2[64] = "data/test.map";\r
-       word baka;\r
+\r
+       char bakapee1[64] = FILENAME_1;\r
+       char bakapee2[64] = FILENAME_2;\r
 \r
                #ifdef __BORLANDC__\r
                        argc=argc;\r
@@ -174,13 +177,7 @@ main(int argc, char *argv[])
 \r
        if(argv[1]){ strcpy(bakapee1, argv[1]);//bakapee1[] = *argv[1];\r
        if(argv[2]) strcpy(bakapee2, argv[2]); }//bakapee2[] = argv[2]; }\r
-#if 0\r
-       else{\r
-       //{ printf("filename!: "); scanf("%[^\n]", &bakapee); }\r
-               strcpy(bakapee1, "data/koishi~.pcx"); //bakapee1 = "data/koishi~.pcx";\r
-               strcpy(bakapee2, "data/test.map"); //bakapee2 = "data/test.map";\r
-       }\r
-#endif\r
+\r
        printf("bakapee1[%s]\n", bakapee1);\r
        printf("bakapee2[%s]\n", bakapee2);\r
        KEYP\r
@@ -188,28 +185,17 @@ main(int argc, char *argv[])
                                                                #ifndef NOVID\r
        Startup16(&gvar);\r
        // save the palette\r
-       modexPalSave(&gvar.video.dpal); modexFadeOff(4, &gvar.video.dpal); //modexPalBlack();\r
+       modexPalSave(&gvar.video.dpal); //modexFadeOff(4, &gvar.video.dpal); //modexPalBlack();\r
                                                                #else //NOVID\r
        StartupCAMMPM(&gvar);\r
-/*     MM_Startup(&gvar);\r
-                                                               #ifdef __16_PM__\r
-                                                               #ifdef __DEBUG_PM__\r
-                                                                       if(dbg_debugpm>0)\r
-                                                                       {\r
-                                                               #endif //__DEBUG_PM__\r
-       PM_Startup(&gvar); PM_CheckMainMem(&gvar); PM_UnlockMainMem(&gvar);\r
-                                                               //0000printf("PM Started\n"); KEYP\r
-                                                               #ifdef __DEBUG_PM__\r
-                                                                       }\r
-                                                               #endif //__DEBUG_PM__\r
-                                                               #endif //__16_PM__\r
-       CA_Startup(&gvar);*/\r
                                                                #endif //elsed NOVID\r
                                                                #ifdef PRINTBBDUMP\r
                                                                //0000\r
 PRINTBB; KEYP\r
                                                                #endif\r
 \r
+       {\r
+       byte w; word baka;\r
        w=0;\r
                                                                #ifdef FILEREADLOAD\r
                                                                #ifdef FILEREAD\r
@@ -229,18 +215,13 @@ PRINTBB; KEYP
                        if(CA_LoadFile(bakapee1, BBUFPTR, &gvar)) baka=1; else baka=0;\r
                        printf("====================================load end===================================\n");\r
                }\r
-                                                               //#ifdef __WATCOMC__\r
-                                                               //      printf("\nsize of big buffer~=%u\n", _bmsize(sega, BBUF));\r
-                                                               //#endif\r
                                                                #ifdef BUFFDUMP\r
                printf("contents of the buffer\n[\n%s\n]\n", BBUFSTRING);\r
-                                                               #endif// #else\r
+                                                               #endif\r
                                                                #ifdef PRINTBBDUMP\r
                PRINTBB;\r
                                                                #endif\r
 \r
-                                                               //endif // BUFFDUMP\r
-\r
                //printf("dark purple = purgable\n");\r
                //printf("medium blue = non purgable\n");\r
                //printf("red = locked\n");\r
@@ -255,12 +236,24 @@ PRINTBB; KEYP
        }\r
                                                                #endif\r
                                                                #endif  //filereadload\r
+       }\r
+\r
+                                                       #ifdef SCROLLLOAD\r
+//                                                     #else           //scrollload\r
+       CA_loadmap(bakapee2, &gvar.map, &gvar);\r
+//     newloadmap(bakapee2, &gvar.map);\r
+       VRS_LoadVRS(bakapee1, &gvar.player[0].enti, &gvar);\r
+       HC_heapdump(&gvar);\r
+       KEYP\r
+                                                       #endif  //scrollload\r
 \r
-#ifdef __WATCOMC__\r
 #ifndef NOVID\r
-       VGAmodeX(8, 0, &gvar);\r
-//     modexPalUpdate0(&gvar.video.palette);\r
+       VL_Startup(&gvar);//    VGAmodeX(8, 0, &gvar);\r
+       modexHiganbanaPageSetup(&gvar);\r
+//     VL_modexPalScramble(&gvar.video.palette);\r
+       VL_LoadPalFileCore(&gvar.video.palette, &gvar);\r
 //     ShapeTest_(&gvar);\r
+#endif\r
        MM_ShowMemory(&gvar);\r
 #if 0\r
        {\r
@@ -297,10 +290,11 @@ PRINTBB; KEYP
        }\r
 }\r
 #endif\r
-       VGAmodeX(0, 0, &gvar);\r
-#endif\r
+#ifndef NOVID\r
+       if(gvar.video.VL_Started)\r
+               VL_Shutdown (&gvar);//VGAmodeX(0, 0, gvar);\r
+       modexFadeOn(4, gvar.video.dpal);\r
 #endif\r
-       MM_ShowMemory(&gvar);\r
        DebugMemory_(&gvar, 1);\r
        MM_DumpData(&gvar);\r
        MM_Report_(&gvar);\r
@@ -311,14 +305,6 @@ PRINTBB; KEYP
        Shutdown16(&gvar);\r
                                                                #else //novid\r
        ShutdownCAMMPM(&gvar);\r
-/*                                                             #ifdef __16_PM__\r
-                                                               #ifdef __DEBUG_PM__\r
-                                                                       if(dbg_debugpm>0)\r
-                                                               #endif //__DEBUG_PM__\r
-       PM_Shutdown(&gvar);\r
-                                                               #endif //__16_PM__\r
-       CA_Shutdown(&gvar);\r
-       MM_Shutdown(&gvar);*/\r
                                                                #endif //NOVID\r
        IN_Shutdown(&gvar);\r
        printf("========================================\n");\r

diff --git a/src/lib/16_hc.c b/src/lib/16_hc.c
index e80d7714a85d50f33f0afdce976e1f44aa33b79b..26fe62480b15c0e39ba166e955972fcc2bd88ece 100755 (executable)
--- a/src/lib/16_hc.c
+++ b/src/lib/16_hc.c
@@ -31,12 +31,9 @@
 #define FARCORELEFTPTR __huge\r
 long HC_farcoreleft()\r
 {\r
-       void FARCORELEFTPTR *hp;\r
-       static long rc=736L;\r
-       long s_rc;\r
+       void FARCORELEFTPTR *hp;                static long rc=736L;    long s_rc;\r
 \r
-       s_rc=rc;\r
-       rc+=2L;\r
+       s_rc=rc;        rc+=2L;\r
        do\r
                hp=halloc(rc-=2L, 1024);\r
        while(hp==NULL&&rc>0L);\r
@@ -581,3 +578,17 @@ void HC_CloseDebug(global_game_variables_t *gvar)
        strcpy(gvar->handle.heapdumpfilename, "heap.16w");\r
 #endif\r
 }\r
+\r
+#ifdef __WATCOMC__\r
+unsigned long farcoreleft()\r
+{\r
+       _fheapgrow();\r
+       return HC_farcoreleft();\r
+}\r
+\r
+unsigned long coreleft()\r
+{\r
+       _nheapgrow();\r
+       return _memavl();\r
+}\r
+#endif\r

diff --git a/src/lib/16_hc.h b/src/lib/16_hc.h
index 5924d2a5fac7aecbacd2d8b489c94fc89f8a80bc..2974a3ac0ec08f2b4a563517318b7961f29451b6 100755 (executable)
--- a/src/lib/16_hc.h
+++ b/src/lib/16_hc.h
@@ -52,4 +52,9 @@ void HC_heapstat0(int heap_status);
 void HC_OpenDebug(global_game_variables_t *gvar);\r
 void HC_CloseDebug(global_game_variables_t *gvar);\r
 \r
+#ifdef __WATCOMC__\r
+unsigned long farcoreleft();\r
+unsigned long coreleft();\r
+#endif\r
+\r
 #endif /* __16HC__ */\r

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 45fcd2dac2c86f2e57c093aec30ee2558dd1aeab..1c95d512bbb8d00df5616395bf872c12b0f66661 100755 (executable)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -160,14 +160,9 @@ extern     int                     profilehandle,debughandle;      //make it into game global
 //#define OLD16_VL\r
 \r
 #define        nil     ((void *)0)\r
-#ifdef __BORLANDC__\r
-//#define _FCORELEFT 0x90000UL-16UL\r
-#define _FCORELEFT HC_farcoreleft()\r
-#define sprite\r
-#endif\r
+\r
 #ifdef __WATCOMC__\r
 //#define _FCORELEFT 0x90000UL+16UL\r
-#define _FCORELEFT HC_farcoreleft()\r
 /*static union REGS CPURegs;\r
 \r
 #define _AX CPURegs.x.ax\r
@@ -187,10 +182,7 @@ extern     int                     profilehandle,debughandle;      //make it into game global
 #define _DL CPURegs.h.dl\r
 \r
 #define geninterrupt(n) int86(n,&CPURegs,&CPURegs);*/\r
-#define peekb(segm,ofs) (*(byte far*)MK_FP((segm),(ofs)))\r
-#define peekw(segm,ofs) (*(word far*)MK_FP((segm),(ofs)))\r
-#define pokeb(segm,ofs,value) (peekb((segm),(ofs)) = (byte)(value))\r
-#define pokew(segm,ofs,value) (peekw((segm),(ofs)) = (word)(value))\r
+\r
 \r
 typedef union REGPACK  regs_t;\r
 #endif\r

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index 2d266df1d667f1b13bcf1dca438544f9849255fc..4582bc68980a1f1a8ab0486fbe86bcb7da9c6422 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -35,6 +35,8 @@ int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
        return -1;\r
 }\r
 \r
+//TODO: WORK ON THIS LIKE CRAZY!       --sparky4\r
+//FIXME: please FIX THIS AND USE CA!   --sparky4\r
 void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {\r
        int i, j, k, indent=0, inner_end;\r
        char *s;\r

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 8e56d67df59e7ee4684e59a426e31391d3cfe173..d9333208168757c8822911af8674f28933d74748 100755 (executable)
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -44,7 +44,7 @@
 int jsoneq(const char *json, jsmntok_t *tok, const char *s);\r
 //word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);\r
 //int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
-//int newloadmap(char *mn, map_t *map);\r
+int newloadmap(char *mn, map_t *map);\r
 int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
 \r
 #endif/*_16_LIB__H_*/\r

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index c5c51486ef9d8d01f6626968657c6cfda337af32..c044ae47a75cb5f688d383eedf6cbf732f116b2c 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -849,7 +849,7 @@ void MM_Reset (global_game_variables_t *gvar)
 void MM_Startup (global_game_variables_t *gvar)\r
 {\r
        int i;\r
-       dword length;\r
+       unsigned        long length;\r
        void far        *start;\r
        unsigned        segstart,seglength;//,endfree;\r
 \r
@@ -857,7 +857,6 @@ void MM_Startup (global_game_variables_t *gvar)
                MM_Shutdown (gvar);\r
 \r
        MM_Reset (gvar);\r
-\r
        gvar->mm.mmstarted = true;\r
        gvar->mm.bombonerror = true;\r
 //\r
@@ -884,17 +883,8 @@ void MM_Startup (global_game_variables_t *gvar)
 //\r
 // get all available near conventional memory segments\r
 //\r
-#ifdef __WATCOMC__\r
-       _nheapgrow();\r
-#endif\r
-       length=(word)_memavl();//(word)coreleft();\r
-       //start = gvar->mm.nearheap = _fmalloc(length);\r
-#ifdef __WATCOMC__\r
-       start = (void __far *)(gvar->mm.nearheap = _nmalloc(length));\r
-#endif\r
-#ifdef __BORLANDC__\r
-       start = (void far *)(gvar->mm.nearheap = malloc(length));\r
-#endif\r
+       length=coreleft();\r
+       start = (void far *)(gvar->mm.nearheap = nearmalloc(length));\r
 \r
        length -= 16-(FP_OFF(start)&15);\r
        length -= SAVENEARHEAP;\r
@@ -903,30 +893,19 @@ void MM_Startup (global_game_variables_t *gvar)
        MML_UseSpace (segstart,seglength, gvar);\r
        gvar->mmi.nearheap = length;\r
        //0000printf("near:     start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, (dword)seglength, length);\r
-\r
 //\r
 // get all available far conventional memory segments\r
 //\r
-#ifdef __WATCOMC__\r
-       _fheapgrow();\r
-#endif\r
-#ifdef __BORLANDC__\r
-//     printf("farcoreleft()                           %lu\n", farcoreleft());\r
-//     printf("(farcoreleft()+32)-_FCORELEFT   %d\n", (sword)((farcoreleft()+32)-_FCORELEFT));\r
-#endif\r
-       length=_FCORELEFT;\r
-       start = gvar->mm.farheap = _fmalloc(length);//start = gvar->mm.farheap = halloc(length, 1);\r
-\r
+       length=HC_farcoreleft();\r
+       start = gvar->mm.farheap = farmalloc(length);\r
        length -= 16-(FP_OFF(start)&15);\r
        length -= SAVEFARHEAP;\r
        seglength = length / 16;                        // now in paragraphs\r
        segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;\r
        MML_UseSpace (segstart,seglength, gvar);\r
        gvar->mmi.farheap = length;\r
-       //0000printf("far:      start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, (dword)seglength, length);\r
-\r
        gvar->mmi.mainmem = gvar->mmi.nearheap + gvar->mmi.farheap;\r
-\r
+       //0000printf("far:      start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, (dword)seglength, length);\r
 #if !defined(__16_PM__)// && defined(__WATCOMC__)\r
 #if 0\r
        if(!dbg_debugpm) {\r

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index d26b647a5e94e1d4e647026472c5bb5d1808610c..55451178a6ada3e34caf539ab6c292f0f2dc5092 100755 (executable)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -42,7 +42,7 @@
 #define FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;}\r
 \r
 #define SAVENEARHEAP   0x400           // space to leave in data segment\r
-#define SAVEFARHEAP    0                       // space to leave in far heap\r
+#define SAVEFARHEAP    0               // space to leave in far heap\r
 \r
 #define        BUFFERSIZE              0x1000          // miscelanious, allways available buffer\r
 \r

diff --git a/src/lib/16_t.h b/src/lib/16_t.h
index db1871f7f5d05d14f860eab9b45e45d7636c7abc..2b573262be2d6210fde3b9b8c024d0cbc0ce0081 100755 (executable)
--- a/src/lib/16_t.h
+++ b/src/lib/16_t.h
@@ -56,9 +56,6 @@ MK_FP(segment value, 0)*/
 //typedef unsigned short _seg; // it will contains segment value (as Borland _seg)\r
 #define _seg __based( void )\r
        #endif\r
-       #ifdef __BORLANDC__\r
-#define _memavl()               coreleft()\r
-       #endif\r
 \r
 typedef void _seg * memptr;\r
 \r
@@ -72,6 +69,9 @@ typedef void _seg * memptr;
 //#define SDFPTRANDPERCONV     &\r
 //#define OBTPTRANDPERCONV     &\r
 //#define SDTPTRANDPERCONV     &\r
+\r
+#define nearmalloc malloc\r
+#define nearfree free\r
 #endif\r
 //\r
 \r
@@ -103,13 +103,19 @@ typedef void _seg * memptr;
 #define getvect _dos_getvect\r
 #define setvect _dos_setvect\r
 \r
+#define farmalloc _fmalloc\r
+#define farfree _ffree\r
+#define nearmalloc _nmalloc\r
+#define nearfree _nfree\r
+\r
 //from http://www.verycomputer.com/3_65d875cc818b54ec_1.htm\r
 void clrscr(void);\r
-#pragma aux clrscr= \\r
-  " mov ah, 0fh " \\r
-  " int 10h " \\r
-  " xor ah, ah " \\r
-  " int 10h " ;\r
+#pragma aux clrscr=\\r
+       " mov ah, 0fh "\\r
+       " int 10h "\\r
+       " xor ah, ah "\\r
+       " int 10h ";\r
+\r
 //from http://stackoverflow.com/questions/18425748/gotoxy-function-using-printf-s-position\r
 inline void gotoxy(int x,int y)\r
 {\r

diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c
index b92facef9b250980b369eeb2f45ab753afb9b9b9..83e20b852476c63d233a5558017bb47f81b4a9f0 100755 (executable)
--- a/src/lib/16_tail.c
+++ b/src/lib/16_tail.c
@@ -646,10 +646,11 @@ void Quit (global_game_variables_t *gvar, char *error)
 \r
 //===========================================================================\r
 \r
-#ifndef __WATCOMC__\r
-char global_temp_status_text[512];\r
-char global_temp_status_text2[512];\r
-#else\r
+//#ifndef __WATCOMC__\r
+//char global_temp_status_text[512];\r
+//char global_temp_status_text2[512];\r
+//#else\r
+#ifdef __WATCOMC__\r
 //\r
 // for mary4 (XT)\r
 // this is from my XT's BIOS\r