From: sparky4 Date: Fri, 14 Oct 2016 20:01:25 +0000 (-0500) Subject: wwww grsegs added wwww X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=a5e754f72b0925b0b9a65414e8369ab75f440918 wwww grsegs added wwww --- diff --git a/DEBUG.16W b/DEBUG.16W index ca2becb3..86023db0 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,210 +1,210 @@ -Seg:0 Size:9970 Owner:0x0 -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 -Seg:26f2 Size:256 Owner:0x1938 -++++ -Seg:2862 Size:44 Owner:0x0 +Seg:0 Size:11821 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++000 +Seg:2eb4 Size:37 Owner:0x0 + -Seg:288e Size:256 Owner:0x1726 -++++ -Seg:298e Size:256 Owner:0x1728 -+++++ -Seg:2a8e Size:256 Owner:0x172a +Seg:2ed9 Size:256 Owner:0x1784 ++++++ +Seg:2fd9 Size:256 Owner:0x1572 ++++ -Seg:2b8e Size:256 Owner:0x172c +Seg:30d9 Size:256 Owner:0x1574 ++++ -Seg:2c8e Size:256 Owner:0x172e +Seg:31d9 Size:256 Owner:0x1576 ++++ -Seg:2d8e Size:256 Owner:0x1730 +Seg:32d9 Size:256 Owner:0x1578 ++++ -Seg:2e8e Size:256 Owner:0x1732 +Seg:33d9 Size:256 Owner:0x157a +++++ -Seg:2f8e Size:256 Owner:0x1734 +Seg:34d9 Size:256 Owner:0x157c ++++ -Seg:308e Size:256 Owner:0x1736 +Seg:35d9 Size:256 Owner:0x157e ++++ -Seg:318e Size:256 Owner:0x1738 +Seg:36d9 Size:256 Owner:0x1580 ++++ -Seg:328e Size:256 Owner:0x173a +Seg:37d9 Size:256 Owner:0x1582 ++++ -Seg:338e Size:256 Owner:0x173c +Seg:38d9 Size:256 Owner:0x1584 +++++ -Seg:348e Size:256 Owner:0x173e +Seg:39d9 Size:256 Owner:0x1586 ++++ -Seg:358e Size:256 Owner:0x1740 +Seg:3ad9 Size:256 Owner:0x1588 ++++ -Seg:368e Size:256 Owner:0x1742 +Seg:3bd9 Size:256 Owner:0x158a ++++ -Seg:378e Size:256 Owner:0x1744 +Seg:3cd9 Size:256 Owner:0x158c ++++ -Seg:388e Size:256 Owner:0x1746 +Seg:3dd9 Size:256 Owner:0x158e +++++ -Seg:398e Size:256 Owner:0x1748 +Seg:3ed9 Size:256 Owner:0x1590 ++++ -Seg:3a8e Size:256 Owner:0x174a +Seg:3fd9 Size:256 Owner:0x1592 ++++ -Seg:3b8e Size:256 Owner:0x174c +Seg:40d9 Size:256 Owner:0x1594 ++++ -Seg:3c8e Size:256 Owner:0x174e +Seg:41d9 Size:256 Owner:0x1596 ++++ -Seg:3d8e Size:256 Owner:0x1750 +Seg:42d9 Size:256 Owner:0x1598 +++++ -Seg:3e8e Size:256 Owner:0x1752 +Seg:43d9 Size:256 Owner:0x159a ++++ -Seg:3f8e Size:256 Owner:0x1754 +Seg:44d9 Size:256 Owner:0x159c ++++ -Seg:408e Size:256 Owner:0x1756 +Seg:45d9 Size:256 Owner:0x159e ++++ -Seg:418e Size:256 Owner:0x1758 +Seg:46d9 Size:256 Owner:0x15a0 ++++ -Seg:428e Size:256 Owner:0x175a +Seg:47d9 Size:256 Owner:0x15a2 +++++ -Seg:438e Size:256 Owner:0x175c +Seg:48d9 Size:256 Owner:0x15a4 ++++ -Seg:448e Size:256 Owner:0x175e +Seg:49d9 Size:256 Owner:0x15a6 ++++ -Seg:458e Size:256 Owner:0x1760 +Seg:4ad9 Size:256 Owner:0x15a8 ++++ -Seg:468e Size:256 Owner:0x1762 +Seg:4bd9 Size:256 Owner:0x15aa ++++ -Seg:478e Size:256 Owner:0x1764 +Seg:4cd9 Size:256 Owner:0x15ac +++++ -Seg:488e Size:256 Owner:0x1766 +Seg:4dd9 Size:256 Owner:0x15ae ++++ -Seg:498e Size:256 Owner:0x1768 +Seg:4ed9 Size:256 Owner:0x15b0 ++++ -Seg:4a8e Size:256 Owner:0x176a +Seg:4fd9 Size:256 Owner:0x15b2 ++++ -Seg:4b8e Size:256 Owner:0x176c +Seg:50d9 Size:256 Owner:0x15b4 ++++ -Seg:4c8e Size:256 Owner:0x176e +Seg:51d9 Size:256 Owner:0x15b6 +++++ -Seg:4d8e Size:256 Owner:0x1770 +Seg:52d9 Size:256 Owner:0x15b8 ++++ -Seg:4e8e Size:256 Owner:0x1772 +Seg:53d9 Size:256 Owner:0x15ba ++++ -Seg:4f8e Size:256 Owner:0x1774 +Seg:54d9 Size:256 Owner:0x15bc ++++ -Seg:508e Size:256 Owner:0x1776 +Seg:55d9 Size:256 Owner:0x15be ++++ -Seg:518e Size:256 Owner:0x1778 +Seg:56d9 Size:256 Owner:0x15c0 +++++ -Seg:528e Size:256 Owner:0x177a +Seg:57d9 Size:256 Owner:0x15c2 ++++ -Seg:538e Size:256 Owner:0x177c +Seg:58d9 Size:256 Owner:0x15c4 ++++ -Seg:548e Size:256 Owner:0x177e +Seg:59d9 Size:256 Owner:0x15c6 ++++ -Seg:558e Size:256 Owner:0x1780 +Seg:5ad9 Size:256 Owner:0x15c8 ++++ -Seg:568e Size:256 Owner:0x1782 +Seg:5bd9 Size:256 Owner:0x15ca +++++ -Seg:578e Size:256 Owner:0x1784 +Seg:5cd9 Size:256 Owner:0x15cc ++++ -Seg:588e Size:256 Owner:0x1786 +Seg:5dd9 Size:256 Owner:0x15ce ++++ -Seg:598e Size:256 Owner:0x1788 +Seg:5ed9 Size:256 Owner:0x15d0 ++++ -Seg:5a8e Size:256 Owner:0x178a +Seg:5fd9 Size:256 Owner:0x15d2 ++++ -Seg:5b8e Size:256 Owner:0x178c +Seg:60d9 Size:256 Owner:0x15d4 +++++ -Seg:5c8e Size:256 Owner:0x178e +Seg:61d9 Size:256 Owner:0x15d6 ++++ -Seg:5d8e Size:256 Owner:0x1790 +Seg:62d9 Size:256 Owner:0x15d8 ++++ -Seg:5e8e Size:256 Owner:0x1792 +Seg:63d9 Size:256 Owner:0x15da ++++ -Seg:5f8e Size:256 Owner:0x1794 +Seg:64d9 Size:256 Owner:0x15dc ++++ -Seg:608e Size:256 Owner:0x1796 +Seg:65d9 Size:256 Owner:0x15de +++++ -Seg:618e Size:256 Owner:0x1798 +Seg:66d9 Size:256 Owner:0x15e0 ++++ -Seg:628e Size:256 Owner:0x179a +Seg:67d9 Size:256 Owner:0x15e2 ++++ -Seg:638e Size:256 Owner:0x179c +Seg:68d9 Size:256 Owner:0x15e4 ++++ -Seg:648e Size:256 Owner:0x179e +Seg:69d9 Size:256 Owner:0x15e6 ++++ -Seg:658e Size:256 Owner:0x17a0 +Seg:6ad9 Size:256 Owner:0x15e8 +++++ -Seg:668e Size:256 Owner:0x17a2 +Seg:6bd9 Size:256 Owner:0x15ea ++++ -Seg:678e Size:256 Owner:0x17a4 +Seg:6cd9 Size:256 Owner:0x15ec ++++ -Seg:688e Size:256 Owner:0x17a6 +Seg:6dd9 Size:256 Owner:0x15ee ++++ -Seg:698e Size:256 Owner:0x17a8 +Seg:6ed9 Size:256 Owner:0x15f0 ++++ -Seg:6a8e Size:256 Owner:0x17aa +Seg:6fd9 Size:256 Owner:0x15f2 +++++ -Seg:6b8e Size:256 Owner:0x17ac +Seg:70d9 Size:256 Owner:0x15f4 ++++ -Seg:6c8e Size:256 Owner:0x17ae +Seg:71d9 Size:256 Owner:0x15f6 ++++ -Seg:6d8e Size:256 Owner:0x17b0 +Seg:72d9 Size:256 Owner:0x15f8 ++++ -Seg:6e8e Size:256 Owner:0x17b2 +Seg:73d9 Size:256 Owner:0x15fa ++++ -Seg:6f8e Size:256 Owner:0x17b4 +Seg:74d9 Size:256 Owner:0x15fc +++++ -Seg:708e Size:256 Owner:0x17b6 +Seg:75d9 Size:256 Owner:0x15fe ++++ -Seg:718e Size:256 Owner:0x17b8 +Seg:76d9 Size:256 Owner:0x1600 ++++ -Seg:728e Size:256 Owner:0x17ba +Seg:77d9 Size:256 Owner:0x1602 ++++ -Seg:738e Size:256 Owner:0x17bc +Seg:78d9 Size:256 Owner:0x1604 ++++ -Seg:748e Size:256 Owner:0x17be +Seg:79d9 Size:256 Owner:0x1606 +++++ -Seg:758e Size:256 Owner:0x17c0 +Seg:7ad9 Size:256 Owner:0x1608 ++++ -Seg:768e Size:256 Owner:0x17c2 +Seg:7bd9 Size:256 Owner:0x160a ++++ -Seg:778e Size:256 Owner:0x17c4 +Seg:7cd9 Size:256 Owner:0x160c ++++ -Seg:788e Size:256 Owner:0x17c6 +Seg:7dd9 Size:256 Owner:0x160e ++++ -Seg:798e Size:256 Owner:0x17c8 +Seg:7ed9 Size:256 Owner:0x1610 +++++ -Seg:7a8e Size:256 Owner:0x17ca +Seg:7fd9 Size:256 Owner:0x1612 ++++ -Seg:7b8e Size:256 Owner:0x17cc +Seg:80d9 Size:256 Owner:0x1614 ++++ -Seg:7c8e Size:256 Owner:0x17ce +Seg:81d9 Size:256 Owner:0x1616 ++++ -Seg:7d8e Size:256 Owner:0x17d0 +Seg:82d9 Size:256 Owner:0x1618 ++++ -Seg:7e8e Size:256 Owner:0x17d2 +Seg:83d9 Size:256 Owner:0x161a +++++ -Seg:7f8e Size:256 Owner:0x17d4 +Seg:84d9 Size:256 Owner:0x161c ++++ -Seg:808e Size:256 Owner:0x17d6 +Seg:85d9 Size:256 Owner:0x161e ++++ -Seg:818e Size:256 Owner:0x17d8 +Seg:86d9 Size:256 Owner:0x1620 ++++ -Seg:828e Size:256 Owner:0x17da +Seg:87d9 Size:256 Owner:0x1622 ++++ -Seg:838e Size:256 Owner:0x17dc +Seg:88d9 Size:256 Owner:0x1624 +++++ -Seg:848e Size:256 Owner:0x17de +Seg:89d9 Size:256 Owner:0x1626 ++++ -Seg:858e Size:256 Owner:0x17e0 +Seg:8ad9 Size:256 Owner:0x1628 ++++ -Seg:868e Size:256 Owner:0x17e2 +Seg:8bd9 Size:256 Owner:0x162a ++++ -Seg:878e Size:256 Owner:0x17e4 +Seg:8cd9 Size:256 Owner:0x162c ++++ -Seg:888e Size:256 Owner:0x17e6 +Seg:8dd9 Size:256 Owner:0x162e +++++ -Seg:898e Size:256 Owner:0x17e8 +Seg:8ed9 Size:256 Owner:0x1630 ++++ -Seg:8a8e Size:256 Owner:0x17ea +Seg:8fd9 Size:256 Owner:0x1632 ++++ -Seg:8b8e Size:256 Owner:0x17ec +Seg:90d9 Size:256 Owner:0x1634 ++++ -Seg:8c8e Size:273 Owner:0xe4c0 -+++++ -Seg:b88e Size:18289 Owner:0x0 -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file +Seg:91d9 Size:256 Owner:0x1636 +++++ +Seg:92d9 Size:256 Owner:0x1638 ++++++ +Seg:93d9 Size:401 Owner:0xf25a +++++++ +Seg:bed9 Size:16678 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index e28a7a00..0526b320 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,47 +1,71 @@ == default == - USED block at 28840016 of size 66 - USED block at 28840058 of size 66 - FREE block at 2884009a of size 18 - USED block at 288400ac of size 136 - USED block at 28840134 of size 20 - FREE block at 28840148 of size 7860 + FREE block at 2ed70016 of size 18 + USED block at 2ed70028 of size 50 + USED block at 2ed7005a of size 50 + USED block at 2ed7008c of size 50 + USED block at 2ed700be of size 50 + USED block at 2ed700f0 of size 50 + USED block at 2ed70122 of size 50 + USED block at 2ed70154 of size 50 + USED block at 2ed70186 of size 50 + USED block at 2ed701b8 of size 50 + USED block at 2ed701ea of size 50 + USED block at 2ed7021c of size 50 + USED block at 2ed7024e of size 50 + USED block at 2ed70280 of size 50 + FREE block at 2ed702b2 of size 14 + USED block at 2ed702c0 of size 20 + USED block at 2ed702d4 of size 136 + FREE block at 2ed7035c of size 7328 OK - end of heap == near == - USED block at 1883e4f6 of size 12 - USED block at 1883e502 of size 332 - USED block at 1883e64e of size 52 - USED block at 1883e682 of size 20 - USED block at 1883e696 of size 20 - USED block at 1883e6aa of size 20 - USED block at 1883e6be of size 20 - USED block at 1883e6d2 of size 20 - USED block at 1883e6e6 of size 6422 + USED block at 1ed6f2a6 of size 12 + USED block at 1ed6f2b2 of size 528 + USED block at 1ed6f4c2 of size 72 + USED block at 1ed6f50a of size 20 + USED block at 1ed6f51e of size 20 + USED block at 1ed6f532 of size 20 + USED block at 1ed6f546 of size 20 + USED block at 1ed6f55a of size 20 + USED block at 1ed6f56e of size 2702 OK - end of heap == far == - USED block at 28840016 of size 66 - USED block at 28840058 of size 66 - USED block at 2884009a of size 18 - USED block at 288400ac of size 136 - USED block at 28840134 of size 20 - USED block at 28840148 of size 7860 + USED block at 2ed70016 of size 18 + USED block at 2ed70028 of size 50 + USED block at 2ed7005a of size 50 + USED block at 2ed7008c of size 50 + USED block at 2ed700be of size 50 + USED block at 2ed700f0 of size 50 + USED block at 2ed70122 of size 50 + USED block at 2ed70154 of size 50 + USED block at 2ed70186 of size 50 + USED block at 2ed701b8 of size 50 + USED block at 2ed701ea of size 50 + USED block at 2ed7021c of size 50 + USED block at 2ed7024e of size 50 + USED block at 2ed70280 of size 50 + USED block at 2ed702b2 of size 14 + USED block at 2ed702c0 of size 20 + USED block at 2ed702d4 of size 136 + USED block at 2ed7035c of size 7328 OK - end of heap Memory Type Total Used Free ---------------- -------- -------- -------- -Default 8166 288 7878 -Near 6918 496 6422 -Far 8166 288 7878 +Default 8166 806 7360 +Near 3414 712 2702 +Far 8166 806 7360 ---------------- -------- -------- -------- -coreleft = 6420 -farcoreleft = 30528 -GetFreeSize = 24128 -GetNearFreeSize = 6422 -GetFarFreeSize = 24128 -memavl = 6420 -stackavail = 31588 +coreleft = 2700 +farcoreleft = 1694 +GetFreeSize = 64548 +GetNearFreeSize = 2702 +GetFarFreeSize = 64548 +memavl = 2700 +stackavail = 31519 diff --git a/MMDUMP.16W b/MMDUMP.16W index 2c92c2c1..89ef9446 100755 Binary files a/MMDUMP.16W and b/MMDUMP.16W differ diff --git a/data/g.pal b/data/g.pal index f3ba115f..f162c4ca 100755 Binary files a/data/g.pal and b/data/g.pal differ diff --git a/src/lib/16_in.c b/src/lib/16_in.c index 619affd8..85709c5e 100755 --- a/src/lib/16_in.c +++ b/src/lib/16_in.c @@ -653,23 +653,9 @@ IN_Startup() checkjoys = true; checkmouse = true; - for (i = 1;i < -#ifdef __WATCOMC__ - __argc -#endif -#ifdef __BORLANDC__ - _argc -#endif - ;i++) + for (i = 1;i < _argc;i++) { - switch (US_CheckParm( -#ifdef __WATCOMC__ - __argv[i] -#endif -#ifdef __BORLANDC__ - _argv[i] -#endif - ,ParmStringsIN)) + switch (US_CheckParm(_argv[i],ParmStringsIN)) { case 0: checkjoys = false; diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index 34229033..90b7ebef 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -842,23 +842,9 @@ void MM_Startup(global_game_variables_t *gvar) // gvar->mmi.EMSmem = 0; //goto emsskip; //0000 - for(i = 1;i < -#ifdef __WATCOMC__ - __argc -#endif -#ifdef __BORLANDC__ - _argc -#endif - ;i++) + for(i = 1;i < _argc;i++) { - if(US_CheckParm( -#ifdef __WATCOMC__ - __argv[i] -#endif -#ifdef __BORLANDC__ - _argv[i] -#endif - ,ParmStringsexmm) == 0) + if(US_CheckParm(_argv[i],ParmStringsexmm) == 0) goto emsskip; // param NOEMS } if(MML_CheckForEMS()) @@ -878,23 +864,9 @@ void MM_Startup(global_game_variables_t *gvar) emsskip: gvar->mmi.XMSmem = 0; goto xmsskip;//0000 - for(i = 1;i < -#ifdef __WATCOMC__ - __argc -#endif -#ifdef __BORLANDC__ - _argc -#endif - ;i++) + for(i = 1;i < _argc;i++) { - if(US_CheckParm( -#ifdef __WATCOMC__ - __argv[i] -#endif -#ifdef __BORLANDC__ - _argv[i] -#endif - ,ParmStringsexmm) == 0) + if(US_CheckParm( _argv[i],ParmStringsexmm) == 0) goto xmsskip; // param NOXMS } if(MML_CheckForXMS()) diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c index 0d1e2bf9..c9019b78 100755 --- a/src/lib/16_pm.c +++ b/src/lib/16_pm.c @@ -1491,23 +1491,9 @@ PM_Startup(global_game_variables_t *gvar) //strcpy(&(gvar->pm.fi.PageFileName), "VSWAP."); nomain = noems = noxms = false; - for (i = 1;i < -#ifdef __WATCOMC__ - __argc -#endif -#ifdef __BORLANDC__ - _argc -#endif - ;i++) + for (i = 1;i < _argc;i++) { - switch (US_CheckParm( -#ifdef __WATCOMC__ - __argv[i] -#endif -#ifdef __BORLANDC__ - _argv[i] -#endif - ,ParmStrings)) + switch (US_CheckParm(_argv[i],ParmStrings)) { case 0: nomain = true; diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h index 5668dda5..32aaed26 100755 --- a/src/lib/typdefst.h +++ b/src/lib/typdefst.h @@ -120,7 +120,7 @@ typedef struct } pan_t; //video -#define NUMCHUNKS 3016 //keen +#define NUMCHUNKS 416 //keen typedef struct { @@ -321,9 +321,9 @@ typedef struct byte ca_levelbit,ca_levelnum; ca_handle_t file; //files to open ca_mapinfo_t camap; - //_seg *grsegs[NUMCHUNKS]; - //byte far grneeded[NUMCHUNKS]; - //huffnode huffnode; + __SEGA *grsegs[NUMCHUNKS]; + byte far grneeded[NUMCHUNKS]; + huffnode huffnode; } ca_t; //========================================================================== diff --git a/src/lib/types.h b/src/lib/types.h index 9d0e7b3b..884aaea9 100755 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -57,4 +57,7 @@ typedef void _seg * memptr; #define __SEGA _seg #endif +#define _argv __argv +#define _argc __argc + #endif/*_TYPE_H_*/