From: sparky4 <sparky4@cock.li> Date: Wed, 14 Jun 2017 17:02:28 +0000 (-0500) Subject: 16_ca needs huge amounts of work and I should remember what needs to be done soon... X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=1fb77e2f5319ee7ad8fca2f9afc040b8bb776648;p=16.git 16_ca needs huge amounts of work and I should remember what needs to be done soon[going to port rest of code to borland c some time so we can use the core components of id engine here ][going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] added 1st scroll back [i work on CA] palette debug show values added wwww and i need to know how to see vrs/vrl imaage data palette index numbers [i am trying to find out how the hell you get the index number values of VRL/VRS] [CA_CacheMap added seems to be used in start a new game] what is mapsegs? bcexmm reports normally again... it acts funny with a unsigned long being assigned coreleft()'s value --- diff --git a/DEBUG.16B b/DEBUG.16B index b423bf34..6424b5b6 100755 --- a/DEBUG.16B +++ b/DEBUG.16B @@ -1,209 +1,209 @@ -[0mSeg:0 Size:5930 Owner:0x0 -[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m[0mSeg:172a Size:256 Owner:0x7837 +[0mSeg:0 Size:5967 Owner:0x0 +[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m[0mSeg:174f Size:256 Owner:0x784f [44;34m[0m[42;32m0 -[0m[0mSeg:182a Size:256 Owner:0x3604 +[0m[0mSeg:184f Size:256 Owner:0x361c [45;35m[0m[42;32m0 -[0m[0mSeg:192a Size:256 Owner:0x3606 +[0m[0mSeg:194f Size:256 Owner:0x361e [45;35m[0m[42;32m0 -[0m[0mSeg:1a2a Size:256 Owner:0x3608 +[0m[0mSeg:1a4f Size:256 Owner:0x3620 [45;35m[0m[42;32m0 -[0m[0mSeg:1b2a Size:256 Owner:0x360a +[0m[0mSeg:1b4f Size:256 Owner:0x3622 [45;35m[0m[42;32m0 -[0m[0mSeg:1c2a Size:256 Owner:0x360c +[0m[0mSeg:1c4f Size:256 Owner:0x3624 [45;35m[0m[42;32m0 -[0m[0mSeg:1d2a Size:256 Owner:0x360e +[0m[0mSeg:1d4f Size:256 Owner:0x3626 [45;35m[0m[42;32m0 -[0m[0mSeg:1e2a Size:256 Owner:0x3610 +[0m[0mSeg:1e4f Size:256 Owner:0x3628 +[45;35m[0m[42;32m00 +[0m[0mSeg:1fbe Size:66 Owner:0x0 +[41;31m[0m[42;32m0 +[0m[0mSeg:2000 Size:256 Owner:0x362a [45;35m[0m[42;32m0 -[0m[0mSeg:1f2a Size:256 Owner:0x3612 +[0m[0mSeg:2100 Size:256 Owner:0x362c [45;35m[0m[42;32m0 -[0m[0mSeg:202a Size:256 Owner:0x3614 +[0m[0mSeg:2200 Size:256 Owner:0x362e [45;35m[0m[42;32m0 -[0m[0mSeg:212a Size:256 Owner:0x3616 +[0m[0mSeg:2300 Size:256 Owner:0x3630 [45;35m[0m[42;32m0 -[0m[0mSeg:222a Size:256 Owner:0x3618 +[0m[0mSeg:2400 Size:256 Owner:0x3632 [45;35m[0m[42;32m0 -[0m[0mSeg:232a Size:256 Owner:0x361a +[0m[0mSeg:2500 Size:256 Owner:0x3634 [45;35m[0m[42;32m0 -[0m[0mSeg:242a Size:256 Owner:0x361c +[0m[0mSeg:2600 Size:256 Owner:0x3636 [45;35m[0m[42;32m0 -[0m[0mSeg:252a Size:256 Owner:0x361e +[0m[0mSeg:2700 Size:256 Owner:0x3638 [45;35m[0m[42;32m0 -[0m[0mSeg:262a Size:256 Owner:0x3620 +[0m[0mSeg:2800 Size:256 Owner:0x363a [45;35m[0m[42;32m0 -[0m[0mSeg:272a Size:256 Owner:0x3622 +[0m[0mSeg:2900 Size:256 Owner:0x363c [45;35m[0m[42;32m0 -[0m[0mSeg:282a Size:256 Owner:0x3624 +[0m[0mSeg:2a00 Size:256 Owner:0x363e [45;35m[0m[42;32m0 -[0m[0mSeg:292a Size:256 Owner:0x3626 +[0m[0mSeg:2b00 Size:256 Owner:0x3640 [45;35m[0m[42;32m0 -[0m[0mSeg:2a2a Size:256 Owner:0x3628 +[0m[0mSeg:2c00 Size:256 Owner:0x3642 [45;35m[0m[42;32m0 -[0m[0mSeg:2b2a Size:256 Owner:0x362a +[0m[0mSeg:2d00 Size:256 Owner:0x3644 [45;35m[0m[42;32m0 -[0m[0mSeg:2c2a Size:256 Owner:0x362c +[0m[0mSeg:2e00 Size:256 Owner:0x3646 [45;35m[0m[42;32m0 -[0m[0mSeg:2d2a Size:256 Owner:0x362e +[0m[0mSeg:2f00 Size:256 Owner:0x3648 [45;35m[0m[42;32m0 -[0m[0mSeg:2e2a Size:256 Owner:0x3630 +[0m[0mSeg:3000 Size:256 Owner:0x364a [45;35m[0m[42;32m0 -[0m[0mSeg:2f2a Size:256 Owner:0x3632 +[0m[0mSeg:3100 Size:256 Owner:0x364c [45;35m[0m[42;32m0 -[0m[0mSeg:302a Size:256 Owner:0x3634 +[0m[0mSeg:3200 Size:256 Owner:0x364e [45;35m[0m[42;32m0 -[0m[0mSeg:312a Size:256 Owner:0x3636 +[0m[0mSeg:3300 Size:256 Owner:0x3650 [45;35m[0m[42;32m0 -[0m[0mSeg:322a Size:256 Owner:0x3638 +[0m[0mSeg:3400 Size:256 Owner:0x3652 [45;35m[0m[42;32m0 -[0m[0mSeg:332a Size:256 Owner:0x363a +[0m[0mSeg:3500 Size:256 Owner:0x3654 [45;35m[0m[42;32m0 -[0m[0mSeg:342a Size:256 Owner:0x363c +[0m[0mSeg:3600 Size:256 Owner:0x3656 [45;35m[0m[42;32m0 -[0m[0mSeg:352a Size:256 Owner:0x363e +[0m[0mSeg:3700 Size:256 Owner:0x3658 [45;35m[0m[42;32m0 -[0m[0mSeg:362a Size:256 Owner:0x3640 +[0m[0mSeg:3800 Size:256 Owner:0x365a [45;35m[0m[42;32m0 -[0m[0mSeg:372a Size:256 Owner:0x3642 +[0m[0mSeg:3900 Size:256 Owner:0x365c [45;35m[0m[42;32m0 -[0m[0mSeg:382a Size:256 Owner:0x3644 +[0m[0mSeg:3a00 Size:256 Owner:0x365e [45;35m[0m[42;32m0 -[0m[0mSeg:392a Size:256 Owner:0x3646 +[0m[0mSeg:3b00 Size:256 Owner:0x3660 [45;35m[0m[42;32m0 -[0m[0mSeg:3a2a Size:256 Owner:0x3648 +[0m[0mSeg:3c00 Size:256 Owner:0x3662 [45;35m[0m[42;32m0 -[0m[0mSeg:3b2a Size:256 Owner:0x364a +[0m[0mSeg:3d00 Size:256 Owner:0x3664 [45;35m[0m[42;32m0 -[0m[0mSeg:3c2a Size:256 Owner:0x364c +[0m[0mSeg:3e00 Size:256 Owner:0x3666 [45;35m[0m[42;32m0 -[0m[0mSeg:3d2a Size:256 Owner:0x364e +[0m[0mSeg:3f00 Size:256 Owner:0x3668 [45;35m[0m[42;32m0 -[0m[0mSeg:3e2a Size:256 Owner:0x3650 +[0m[0mSeg:4000 Size:256 Owner:0x366a [45;35m[0m[42;32m0 -[0m[0mSeg:3f2a Size:256 Owner:0x3652 +[0m[0mSeg:4100 Size:256 Owner:0x366c [45;35m[0m[42;32m0 -[0m[0mSeg:402a Size:256 Owner:0x3654 +[0m[0mSeg:4200 Size:256 Owner:0x366e [45;35m[0m[42;32m0 -[0m[0mSeg:412a Size:256 Owner:0x3656 +[0m[0mSeg:4300 Size:256 Owner:0x3670 [45;35m[0m[42;32m0 -[0m[0mSeg:422a Size:256 Owner:0x3658 +[0m[0mSeg:4400 Size:256 Owner:0x3672 [45;35m[0m[42;32m0 -[0m[0mSeg:432a Size:256 Owner:0x365a +[0m[0mSeg:4500 Size:256 Owner:0x3674 [45;35m[0m[42;32m0 -[0m[0mSeg:442a Size:256 Owner:0x365c +[0m[0mSeg:4600 Size:256 Owner:0x3676 [45;35m[0m[42;32m0 -[0m[0mSeg:452a Size:256 Owner:0x365e +[0m[0mSeg:4700 Size:256 Owner:0x3678 [45;35m[0m[42;32m0 -[0m[0mSeg:462a Size:256 Owner:0x3660 +[0m[0mSeg:4800 Size:256 Owner:0x367a [45;35m[0m[42;32m0 -[0m[0mSeg:472a Size:256 Owner:0x3662 +[0m[0mSeg:4900 Size:256 Owner:0x367c [45;35m[0m[42;32m0 -[0m[0mSeg:482a Size:256 Owner:0x3664 +[0m[0mSeg:4a00 Size:256 Owner:0x367e [45;35m[0m[42;32m0 -[0m[0mSeg:492a Size:256 Owner:0x3666 +[0m[0mSeg:4b00 Size:256 Owner:0x3680 [45;35m[0m[42;32m0 -[0m[0mSeg:4a2a Size:256 Owner:0x3668 +[0m[0mSeg:4c00 Size:256 Owner:0x3682 [45;35m[0m[42;32m0 -[0m[0mSeg:4b2a Size:256 Owner:0x366a +[0m[0mSeg:4d00 Size:256 Owner:0x3684 [45;35m[0m[42;32m0 -[0m[0mSeg:4c2a Size:256 Owner:0x366c +[0m[0mSeg:4e00 Size:256 Owner:0x3686 [45;35m[0m[42;32m0 -[0m[0mSeg:4d2a Size:256 Owner:0x366e +[0m[0mSeg:4f00 Size:256 Owner:0x3688 [45;35m[0m[42;32m0 -[0m[0mSeg:4e2a Size:256 Owner:0x3670 +[0m[0mSeg:5000 Size:256 Owner:0x368a [45;35m[0m[42;32m0 -[0m[0mSeg:4f2a Size:256 Owner:0x3672 +[0m[0mSeg:5100 Size:256 Owner:0x368c [45;35m[0m[42;32m0 -[0m[0mSeg:502a Size:256 Owner:0x3674 +[0m[0mSeg:5200 Size:256 Owner:0x368e [45;35m[0m[42;32m0 -[0m[0mSeg:512a Size:256 Owner:0x3676 +[0m[0mSeg:5300 Size:256 Owner:0x3690 [45;35m[0m[42;32m0 -[0m[0mSeg:522a Size:256 Owner:0x3678 +[0m[0mSeg:5400 Size:256 Owner:0x3692 [45;35m[0m[42;32m0 -[0m[0mSeg:532a Size:256 Owner:0x367a +[0m[0mSeg:5500 Size:256 Owner:0x3694 [45;35m[0m[42;32m0 -[0m[0mSeg:542a Size:256 Owner:0x367c +[0m[0mSeg:5600 Size:256 Owner:0x3696 [45;35m[0m[42;32m0 -[0m[0mSeg:552a Size:256 Owner:0x367e +[0m[0mSeg:5700 Size:256 Owner:0x3698 [45;35m[0m[42;32m0 -[0m[0mSeg:562a Size:256 Owner:0x3680 +[0m[0mSeg:5800 Size:256 Owner:0x369a [45;35m[0m[42;32m0 -[0m[0mSeg:572a Size:256 Owner:0x3682 +[0m[0mSeg:5900 Size:256 Owner:0x369c [45;35m[0m[42;32m0 -[0m[0mSeg:582a Size:256 Owner:0x3684 +[0m[0mSeg:5a00 Size:256 Owner:0x369e [45;35m[0m[42;32m0 -[0m[0mSeg:592a Size:256 Owner:0x3686 +[0m[0mSeg:5b00 Size:256 Owner:0x36a0 [45;35m[0m[42;32m0 -[0m[0mSeg:5a2a Size:256 Owner:0x3688 +[0m[0mSeg:5c00 Size:256 Owner:0x36a2 [45;35m[0m[42;32m0 -[0m[0mSeg:5b2a Size:256 Owner:0x368a +[0m[0mSeg:5d00 Size:256 Owner:0x36a4 [45;35m[0m[42;32m0 -[0m[0mSeg:5c2a Size:256 Owner:0x368c +[0m[0mSeg:5e00 Size:256 Owner:0x36a6 [45;35m[0m[42;32m0 -[0m[0mSeg:5d2a Size:256 Owner:0x368e +[0m[0mSeg:5f00 Size:256 Owner:0x36a8 [45;35m[0m[42;32m0 -[0m[0mSeg:5e2a Size:256 Owner:0x3690 +[0m[0mSeg:6000 Size:256 Owner:0x36aa [45;35m[0m[42;32m0 -[0m[0mSeg:5f2a Size:256 Owner:0x3692 +[0m[0mSeg:6100 Size:256 Owner:0x36ac [45;35m[0m[42;32m0 -[0m[0mSeg:602a Size:256 Owner:0x3694 +[0m[0mSeg:6200 Size:256 Owner:0x36ae [45;35m[0m[42;32m0 -[0m[0mSeg:612a Size:256 Owner:0x3696 +[0m[0mSeg:6300 Size:256 Owner:0x36b0 [45;35m[0m[42;32m0 -[0m[0mSeg:622a Size:256 Owner:0x3698 +[0m[0mSeg:6400 Size:256 Owner:0x36b2 [45;35m[0m[42;32m0 -[0m[0mSeg:632a Size:256 Owner:0x369a +[0m[0mSeg:6500 Size:256 Owner:0x36b4 [45;35m[0m[42;32m0 -[0m[0mSeg:642a Size:256 Owner:0x369c +[0m[0mSeg:6600 Size:256 Owner:0x36b6 [45;35m[0m[42;32m0 -[0m[0mSeg:652a Size:256 Owner:0x369e +[0m[0mSeg:6700 Size:256 Owner:0x36b8 [45;35m[0m[42;32m0 -[0m[0mSeg:662a Size:256 Owner:0x36a0 +[0m[0mSeg:6800 Size:256 Owner:0x36ba [45;35m[0m[42;32m0 -[0m[0mSeg:672a Size:256 Owner:0x36a2 +[0m[0mSeg:6900 Size:256 Owner:0x36bc [45;35m[0m[42;32m0 -[0m[0mSeg:682a Size:256 Owner:0x36a4 +[0m[0mSeg:6a00 Size:256 Owner:0x36be [45;35m[0m[42;32m0 -[0m[0mSeg:692a Size:256 Owner:0x36a6 +[0m[0mSeg:6b00 Size:256 Owner:0x36c0 [45;35m[0m[42;32m0 -[0m[0mSeg:6a2a Size:256 Owner:0x36a8 +[0m[0mSeg:6c00 Size:256 Owner:0x36c2 [45;35m[0m[42;32m0 -[0m[0mSeg:6b2a Size:256 Owner:0x36aa +[0m[0mSeg:6d00 Size:256 Owner:0x36c4 [45;35m[0m[42;32m0 -[0m[0mSeg:6c2a Size:256 Owner:0x36ac +[0m[0mSeg:6e00 Size:256 Owner:0x36c6 [45;35m[0m[42;32m0 -[0m[0mSeg:6d2a Size:256 Owner:0x36ae +[0m[0mSeg:6f00 Size:256 Owner:0x36c8 [45;35m[0m[42;32m0 -[0m[0mSeg:6e2a Size:256 Owner:0x36b0 +[0m[0mSeg:7000 Size:256 Owner:0x36ca [45;35m[0m[42;32m0 -[0m[0mSeg:6f2a Size:256 Owner:0x36b2 +[0m[0mSeg:7100 Size:256 Owner:0x36cc [45;35m[0m[42;32m0 -[0m[0mSeg:702a Size:256 Owner:0x36b4 +[0m[0mSeg:7200 Size:256 Owner:0x36ce [45;35m[0m[42;32m0 -[0m[0mSeg:712a Size:256 Owner:0x36b6 +[0m[0mSeg:7300 Size:256 Owner:0x36d0 [45;35m[0m[42;32m0 -[0m[0mSeg:722a Size:256 Owner:0x36b8 +[0m[0mSeg:7400 Size:256 Owner:0x36d2 [45;35m[0m[42;32m0 -[0m[0mSeg:732a Size:256 Owner:0x36ba +[0m[0mSeg:7500 Size:256 Owner:0x36d4 [45;35m[0m[42;32m0 -[0m[0mSeg:742a Size:256 Owner:0x36bc +[0m[0mSeg:7600 Size:256 Owner:0x36d6 [45;35m[0m[42;32m0 -[0m[0mSeg:752a Size:256 Owner:0x36be +[0m[0mSeg:7700 Size:256 Owner:0x36d8 [45;35m[0m[42;32m0 -[0m[0mSeg:762a Size:256 Owner:0x36c0 +[0m[0mSeg:7800 Size:256 Owner:0x36da [45;35m[0m[42;32m0 -[0m[0mSeg:772a Size:256 Owner:0x36c2 +[0m[0mSeg:7900 Size:256 Owner:0x36dc [45;35m[0m[42;32m0 -[0m[0mSeg:782a Size:256 Owner:0x36c4 +[0m[0mSeg:7a00 Size:256 Owner:0x36de [45;35m[0m[42;32m0 -[0m[0mSeg:792a Size:256 Owner:0x36c6 +[0m[0mSeg:7b00 Size:256 Owner:0x36e0 [45;35m[0m[42;32m0 -[0m[0mSeg:7a2a Size:256 Owner:0x36c8 +[0m[0mSeg:7c00 Size:256 Owner:0x36e2 [45;35m[0m[42;32m0 -[0m[0mSeg:7b2a Size:256 Owner:0x36ca -[45;35m[0m[42;32m0 -[0m[0mSeg:7c2a Size:273 Owner:0x7837 -[44;34m[0m[42;32m000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -[0m[0mSeg:9fbe Size:32834 Owner:0x0 -[41;31m[0m[42;32m +[0m[0mSeg:7d00 Size:273 Owner:0x784f +[44;34m[0m[42;32m0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 [0m[0mSeg:9ffe Size:24577 Owner:0x0 [41;31m[0m \ No newline at end of file diff --git a/HEAP.16B b/HEAP.16B index fd91dabc..07e50353 100755 --- a/HEAP.16B +++ b/HEAP.16B @@ -1,21 +1,23 @@ == near == - FREE block at 1704:0004 of size 528 - FREE block at 1725:0004 of size 64 + FREE block at 1708:0004 of size 528 + FREE block at 1729:0004 of size 528 + FREE block at 174A:0004 of size 64 OK - end of heap == far == - FREE block at 1704:0004 of size 528 - FREE block at 1725:0004 of size 64 + FREE block at 1708:0004 of size 528 + FREE block at 1729:0004 of size 528 + FREE block at 174A:0004 of size 64 OK - end of heap ---------------- -------- -------- -------- -Near 592 0 0 -Far 592 0 0 +Near 1120 0 0 +Far 1120 0 0 ---------------- -------- -------- -------- -HC_coreleft = 36051 +HC_coreleft = 35459 HC_farcoreleft = 0 HC_GetNearFreeSize = 0 HC_GetFarFreeSize = 0 diff --git a/MEMINFO.16W b/MEMINFO.16W new file mode 100755 index 00000000..e69de29b diff --git a/MMDUMP.16B b/MMDUMP.16B index b66b18e4..29c58daf 100755 Binary files a/MMDUMP.16B and b/MMDUMP.16B differ diff --git a/bcexmm.dsk b/bcexmm.dsk index b0e92853..44f458fe 100755 Binary files a/bcexmm.dsk and b/bcexmm.dsk differ diff --git a/bcexmm.exe b/bcexmm.exe index 281594e0..d2503e12 100755 Binary files a/bcexmm.exe and b/bcexmm.exe differ diff --git a/bcexmm.prj b/bcexmm.prj index ecfa2713..09284e08 100755 Binary files a/bcexmm.prj and b/bcexmm.prj differ diff --git a/ps.exe b/ps.exe index dff96744..27626767 100755 Binary files a/ps.exe and b/ps.exe differ diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index dcb8d86f..40ef95a0 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -883,7 +883,7 @@ void MM_Startup (global_game_variables_t *gvar) // // get all available near conventional memory segments // - length=coreleft(); + length=(word)coreleft(); start = (void far *)(gvar->mm.nearheap = _nmalloc(length)); length -= 16-(FP_OFF(start)&15); diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h index 55451178..8f499423 100755 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -96,11 +96,12 @@ //========================================================================== -//moved to typdefst +//typedef void _seg * memptr; //moved to 16_t.h + /*typedef struct { dword nearheap,farheap,EMSmem,XMSmem,mainmem; -} mminfotype;*/ +} mminfotype;*/ //moved to 16_tdef.h //==========================================================================