From: sparky4 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 @@ -Seg:0 Size:5930 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++Seg:172a Size:256 Owner:0x7837 +Seg:0 Size:5967 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++Seg:174f Size:256 Owner:0x784f 0 -Seg:182a Size:256 Owner:0x3604 +Seg:184f Size:256 Owner:0x361c 0 -Seg:192a Size:256 Owner:0x3606 +Seg:194f Size:256 Owner:0x361e 0 -Seg:1a2a Size:256 Owner:0x3608 +Seg:1a4f Size:256 Owner:0x3620 0 -Seg:1b2a Size:256 Owner:0x360a +Seg:1b4f Size:256 Owner:0x3622 0 -Seg:1c2a Size:256 Owner:0x360c +Seg:1c4f Size:256 Owner:0x3624 0 -Seg:1d2a Size:256 Owner:0x360e +Seg:1d4f Size:256 Owner:0x3626 0 -Seg:1e2a Size:256 Owner:0x3610 +Seg:1e4f Size:256 Owner:0x3628 +00 +Seg:1fbe Size:66 Owner:0x0 +0 +Seg:2000 Size:256 Owner:0x362a 0 -Seg:1f2a Size:256 Owner:0x3612 +Seg:2100 Size:256 Owner:0x362c 0 -Seg:202a Size:256 Owner:0x3614 +Seg:2200 Size:256 Owner:0x362e 0 -Seg:212a Size:256 Owner:0x3616 +Seg:2300 Size:256 Owner:0x3630 0 -Seg:222a Size:256 Owner:0x3618 +Seg:2400 Size:256 Owner:0x3632 0 -Seg:232a Size:256 Owner:0x361a +Seg:2500 Size:256 Owner:0x3634 0 -Seg:242a Size:256 Owner:0x361c +Seg:2600 Size:256 Owner:0x3636 0 -Seg:252a Size:256 Owner:0x361e +Seg:2700 Size:256 Owner:0x3638 0 -Seg:262a Size:256 Owner:0x3620 +Seg:2800 Size:256 Owner:0x363a 0 -Seg:272a Size:256 Owner:0x3622 +Seg:2900 Size:256 Owner:0x363c 0 -Seg:282a Size:256 Owner:0x3624 +Seg:2a00 Size:256 Owner:0x363e 0 -Seg:292a Size:256 Owner:0x3626 +Seg:2b00 Size:256 Owner:0x3640 0 -Seg:2a2a Size:256 Owner:0x3628 +Seg:2c00 Size:256 Owner:0x3642 0 -Seg:2b2a Size:256 Owner:0x362a +Seg:2d00 Size:256 Owner:0x3644 0 -Seg:2c2a Size:256 Owner:0x362c +Seg:2e00 Size:256 Owner:0x3646 0 -Seg:2d2a Size:256 Owner:0x362e +Seg:2f00 Size:256 Owner:0x3648 0 -Seg:2e2a Size:256 Owner:0x3630 +Seg:3000 Size:256 Owner:0x364a 0 -Seg:2f2a Size:256 Owner:0x3632 +Seg:3100 Size:256 Owner:0x364c 0 -Seg:302a Size:256 Owner:0x3634 +Seg:3200 Size:256 Owner:0x364e 0 -Seg:312a Size:256 Owner:0x3636 +Seg:3300 Size:256 Owner:0x3650 0 -Seg:322a Size:256 Owner:0x3638 +Seg:3400 Size:256 Owner:0x3652 0 -Seg:332a Size:256 Owner:0x363a +Seg:3500 Size:256 Owner:0x3654 0 -Seg:342a Size:256 Owner:0x363c +Seg:3600 Size:256 Owner:0x3656 0 -Seg:352a Size:256 Owner:0x363e +Seg:3700 Size:256 Owner:0x3658 0 -Seg:362a Size:256 Owner:0x3640 +Seg:3800 Size:256 Owner:0x365a 0 -Seg:372a Size:256 Owner:0x3642 +Seg:3900 Size:256 Owner:0x365c 0 -Seg:382a Size:256 Owner:0x3644 +Seg:3a00 Size:256 Owner:0x365e 0 -Seg:392a Size:256 Owner:0x3646 +Seg:3b00 Size:256 Owner:0x3660 0 -Seg:3a2a Size:256 Owner:0x3648 +Seg:3c00 Size:256 Owner:0x3662 0 -Seg:3b2a Size:256 Owner:0x364a +Seg:3d00 Size:256 Owner:0x3664 0 -Seg:3c2a Size:256 Owner:0x364c +Seg:3e00 Size:256 Owner:0x3666 0 -Seg:3d2a Size:256 Owner:0x364e +Seg:3f00 Size:256 Owner:0x3668 0 -Seg:3e2a Size:256 Owner:0x3650 +Seg:4000 Size:256 Owner:0x366a 0 -Seg:3f2a Size:256 Owner:0x3652 +Seg:4100 Size:256 Owner:0x366c 0 -Seg:402a Size:256 Owner:0x3654 +Seg:4200 Size:256 Owner:0x366e 0 -Seg:412a Size:256 Owner:0x3656 +Seg:4300 Size:256 Owner:0x3670 0 -Seg:422a Size:256 Owner:0x3658 +Seg:4400 Size:256 Owner:0x3672 0 -Seg:432a Size:256 Owner:0x365a +Seg:4500 Size:256 Owner:0x3674 0 -Seg:442a Size:256 Owner:0x365c +Seg:4600 Size:256 Owner:0x3676 0 -Seg:452a Size:256 Owner:0x365e +Seg:4700 Size:256 Owner:0x3678 0 -Seg:462a Size:256 Owner:0x3660 +Seg:4800 Size:256 Owner:0x367a 0 -Seg:472a Size:256 Owner:0x3662 +Seg:4900 Size:256 Owner:0x367c 0 -Seg:482a Size:256 Owner:0x3664 +Seg:4a00 Size:256 Owner:0x367e 0 -Seg:492a Size:256 Owner:0x3666 +Seg:4b00 Size:256 Owner:0x3680 0 -Seg:4a2a Size:256 Owner:0x3668 +Seg:4c00 Size:256 Owner:0x3682 0 -Seg:4b2a Size:256 Owner:0x366a +Seg:4d00 Size:256 Owner:0x3684 0 -Seg:4c2a Size:256 Owner:0x366c +Seg:4e00 Size:256 Owner:0x3686 0 -Seg:4d2a Size:256 Owner:0x366e +Seg:4f00 Size:256 Owner:0x3688 0 -Seg:4e2a Size:256 Owner:0x3670 +Seg:5000 Size:256 Owner:0x368a 0 -Seg:4f2a Size:256 Owner:0x3672 +Seg:5100 Size:256 Owner:0x368c 0 -Seg:502a Size:256 Owner:0x3674 +Seg:5200 Size:256 Owner:0x368e 0 -Seg:512a Size:256 Owner:0x3676 +Seg:5300 Size:256 Owner:0x3690 0 -Seg:522a Size:256 Owner:0x3678 +Seg:5400 Size:256 Owner:0x3692 0 -Seg:532a Size:256 Owner:0x367a +Seg:5500 Size:256 Owner:0x3694 0 -Seg:542a Size:256 Owner:0x367c +Seg:5600 Size:256 Owner:0x3696 0 -Seg:552a Size:256 Owner:0x367e +Seg:5700 Size:256 Owner:0x3698 0 -Seg:562a Size:256 Owner:0x3680 +Seg:5800 Size:256 Owner:0x369a 0 -Seg:572a Size:256 Owner:0x3682 +Seg:5900 Size:256 Owner:0x369c 0 -Seg:582a Size:256 Owner:0x3684 +Seg:5a00 Size:256 Owner:0x369e 0 -Seg:592a Size:256 Owner:0x3686 +Seg:5b00 Size:256 Owner:0x36a0 0 -Seg:5a2a Size:256 Owner:0x3688 +Seg:5c00 Size:256 Owner:0x36a2 0 -Seg:5b2a Size:256 Owner:0x368a +Seg:5d00 Size:256 Owner:0x36a4 0 -Seg:5c2a Size:256 Owner:0x368c +Seg:5e00 Size:256 Owner:0x36a6 0 -Seg:5d2a Size:256 Owner:0x368e +Seg:5f00 Size:256 Owner:0x36a8 0 -Seg:5e2a Size:256 Owner:0x3690 +Seg:6000 Size:256 Owner:0x36aa 0 -Seg:5f2a Size:256 Owner:0x3692 +Seg:6100 Size:256 Owner:0x36ac 0 -Seg:602a Size:256 Owner:0x3694 +Seg:6200 Size:256 Owner:0x36ae 0 -Seg:612a Size:256 Owner:0x3696 +Seg:6300 Size:256 Owner:0x36b0 0 -Seg:622a Size:256 Owner:0x3698 +Seg:6400 Size:256 Owner:0x36b2 0 -Seg:632a Size:256 Owner:0x369a +Seg:6500 Size:256 Owner:0x36b4 0 -Seg:642a Size:256 Owner:0x369c +Seg:6600 Size:256 Owner:0x36b6 0 -Seg:652a Size:256 Owner:0x369e +Seg:6700 Size:256 Owner:0x36b8 0 -Seg:662a Size:256 Owner:0x36a0 +Seg:6800 Size:256 Owner:0x36ba 0 -Seg:672a Size:256 Owner:0x36a2 +Seg:6900 Size:256 Owner:0x36bc 0 -Seg:682a Size:256 Owner:0x36a4 +Seg:6a00 Size:256 Owner:0x36be 0 -Seg:692a Size:256 Owner:0x36a6 +Seg:6b00 Size:256 Owner:0x36c0 0 -Seg:6a2a Size:256 Owner:0x36a8 +Seg:6c00 Size:256 Owner:0x36c2 0 -Seg:6b2a Size:256 Owner:0x36aa +Seg:6d00 Size:256 Owner:0x36c4 0 -Seg:6c2a Size:256 Owner:0x36ac +Seg:6e00 Size:256 Owner:0x36c6 0 -Seg:6d2a Size:256 Owner:0x36ae +Seg:6f00 Size:256 Owner:0x36c8 0 -Seg:6e2a Size:256 Owner:0x36b0 +Seg:7000 Size:256 Owner:0x36ca 0 -Seg:6f2a Size:256 Owner:0x36b2 +Seg:7100 Size:256 Owner:0x36cc 0 -Seg:702a Size:256 Owner:0x36b4 +Seg:7200 Size:256 Owner:0x36ce 0 -Seg:712a Size:256 Owner:0x36b6 +Seg:7300 Size:256 Owner:0x36d0 0 -Seg:722a Size:256 Owner:0x36b8 +Seg:7400 Size:256 Owner:0x36d2 0 -Seg:732a Size:256 Owner:0x36ba +Seg:7500 Size:256 Owner:0x36d4 0 -Seg:742a Size:256 Owner:0x36bc +Seg:7600 Size:256 Owner:0x36d6 0 -Seg:752a Size:256 Owner:0x36be +Seg:7700 Size:256 Owner:0x36d8 0 -Seg:762a Size:256 Owner:0x36c0 +Seg:7800 Size:256 Owner:0x36da 0 -Seg:772a Size:256 Owner:0x36c2 +Seg:7900 Size:256 Owner:0x36dc 0 -Seg:782a Size:256 Owner:0x36c4 +Seg:7a00 Size:256 Owner:0x36de 0 -Seg:792a Size:256 Owner:0x36c6 +Seg:7b00 Size:256 Owner:0x36e0 0 -Seg:7a2a Size:256 Owner:0x36c8 +Seg:7c00 Size:256 Owner:0x36e2 0 -Seg:7b2a Size:256 Owner:0x36ca -0 -Seg:7c2a Size:273 Owner:0x7837 -000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 -Seg:9fbe Size:32834 Owner:0x0 - +Seg:7d00 Size:273 Owner:0x784f +0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 Seg:9ffe Size:24577 Owner:0x0  \ 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 //==========================================================================