From: sparky4 Date: Wed, 12 Oct 2016 16:36:58 +0000 (-0500) Subject: fixed an issue with EMS_INT becuase i learned there is 2 wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=b23775e80d164c1277b528886f536e4950885459;p=16.git fixed an issue with EMS_INT becuase i learned there is 2 wwww --- diff --git a/DEBUG.16B b/DEBUG.16B new file mode 100755 index 00000000..7dee836b --- /dev/null +++ b/DEBUG.16B @@ -0,0 +1,210 @@ +Seg:0 Size:5360 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 +Seg:14f0 Size:256 Owner:0xed5 +++++ +Seg:15f0 Size:256 Owner:0xcd6 +++++ +Seg:16f0 Size:256 Owner:0xcd8 +++++ +Seg:17f0 Size:256 Owner:0xcda +++++ +Seg:18f0 Size:256 Owner:0xcdc +++++ +Seg:19f0 Size:256 Owner:0xcde +++++ +Seg:1af0 Size:256 Owner:0xce0 +++++ +Seg:1bf0 Size:256 Owner:0xce2 +++++ +Seg:1cf0 Size:256 Owner:0xce4 +++++ +Seg:1df0 Size:256 Owner:0xce6 +++++ +Seg:1ef0 Size:256 Owner:0xce8 +++++ +Seg:1ff0 Size:256 Owner:0xcea +++++ +Seg:20f0 Size:256 Owner:0xcec +++++ +Seg:21f0 Size:256 Owner:0xcee +++++ +Seg:22f0 Size:256 Owner:0xcf0 +++++ +Seg:23f0 Size:256 Owner:0xcf2 +++++ +Seg:24f0 Size:256 Owner:0xcf4 +++++ +Seg:25f0 Size:256 Owner:0xcf6 +++++ +Seg:26f0 Size:256 Owner:0xcf8 +++++ +Seg:27f0 Size:256 Owner:0xcfa +++++ +Seg:28f0 Size:256 Owner:0xcfc +++++ +Seg:29f0 Size:256 Owner:0xcfe +++++ +Seg:2af0 Size:256 Owner:0xd00 +++++ +Seg:2bf0 Size:256 Owner:0xd02 +++++ +Seg:2cf0 Size:256 Owner:0xd04 +++++ +Seg:2df0 Size:256 Owner:0xd06 +++++ +Seg:2ef0 Size:256 Owner:0xd08 +++++ +Seg:2ff0 Size:256 Owner:0xd0a +++++ +Seg:30f0 Size:256 Owner:0xd0c +++++ +Seg:31f0 Size:256 Owner:0xd0e +++++ +Seg:32f0 Size:256 Owner:0xd10 +++++ +Seg:33f0 Size:256 Owner:0xd12 +++++ +Seg:34f0 Size:256 Owner:0xd14 +++++ +Seg:35f0 Size:256 Owner:0xd16 +++++ +Seg:36f0 Size:256 Owner:0xd18 +++++ +Seg:37f0 Size:256 Owner:0xd1a +++++ +Seg:38f0 Size:256 Owner:0xd1c +++++ +Seg:39f0 Size:256 Owner:0xd1e +++++ +Seg:3af0 Size:256 Owner:0xd20 +++++ +Seg:3bf0 Size:256 Owner:0xd22 +++++ +Seg:3cf0 Size:256 Owner:0xd24 +++++ +Seg:3df0 Size:256 Owner:0xd26 +++++ +Seg:3ef0 Size:256 Owner:0xd28 +++++ +Seg:3ff0 Size:256 Owner:0xd2a +++++ +Seg:40f0 Size:256 Owner:0xd2c +++++ +Seg:41f0 Size:256 Owner:0xd2e +++++ +Seg:42f0 Size:256 Owner:0xd30 +++++ +Seg:43f0 Size:256 Owner:0xd32 +++++ +Seg:44f0 Size:256 Owner:0xd34 +++++ +Seg:45f0 Size:256 Owner:0xd36 +++++ +Seg:46f0 Size:256 Owner:0xd38 +++++ +Seg:47f0 Size:256 Owner:0xd3a +++++ +Seg:48f0 Size:256 Owner:0xd3c +++++ +Seg:49f0 Size:256 Owner:0xd3e +++++ +Seg:4af0 Size:256 Owner:0xd40 +++++ +Seg:4bf0 Size:256 Owner:0xd42 +++++ +Seg:4cf0 Size:256 Owner:0xd44 +++++ +Seg:4df0 Size:256 Owner:0xd46 +++++ +Seg:4ef0 Size:256 Owner:0xd48 +++++ +Seg:4ff0 Size:256 Owner:0xd4a +++++ +Seg:50f0 Size:256 Owner:0xd4c +++++ +Seg:51f0 Size:256 Owner:0xd4e +++++ +Seg:52f0 Size:256 Owner:0xd50 +++++ +Seg:53f0 Size:256 Owner:0xd52 +++++ +Seg:54f0 Size:256 Owner:0xd54 +++++ +Seg:55f0 Size:256 Owner:0xd56 +++++ +Seg:56f0 Size:256 Owner:0xd58 +++++ +Seg:57f0 Size:256 Owner:0xd5a +++++ +Seg:58f0 Size:256 Owner:0xd5c +++++ +Seg:59f0 Size:256 Owner:0xd5e +++++ +Seg:5af0 Size:256 Owner:0xd60 +++++ +Seg:5bf0 Size:256 Owner:0xd62 +++++ +Seg:5cf0 Size:256 Owner:0xd64 +++++ +Seg:5df0 Size:256 Owner:0xd66 +++++ +Seg:5ef0 Size:256 Owner:0xd68 +++++ +Seg:5ff0 Size:256 Owner:0xd6a +++++ +Seg:60f0 Size:256 Owner:0xd6c +++++ +Seg:61f0 Size:256 Owner:0xd6e +++++ +Seg:62f0 Size:256 Owner:0xd70 +++++ +Seg:63f0 Size:256 Owner:0xd72 +++++ +Seg:64f0 Size:256 Owner:0xd74 +++++ +Seg:65f0 Size:256 Owner:0xd76 +++++ +Seg:66f0 Size:256 Owner:0xd78 +++++ +Seg:67f0 Size:256 Owner:0xd7a +++++ +Seg:68f0 Size:256 Owner:0xd7c +++++ +Seg:69f0 Size:256 Owner:0xd7e +++++ +Seg:6af0 Size:256 Owner:0xd80 +++++ +Seg:6bf0 Size:256 Owner:0xd82 +++++ +Seg:6cf0 Size:256 Owner:0xd84 +++++ +Seg:6df0 Size:256 Owner:0xd86 +++++ +Seg:6ef0 Size:256 Owner:0xd88 +++++ +Seg:6ff0 Size:256 Owner:0xd8a +++++ +Seg:70f0 Size:256 Owner:0xd8c +++++ +Seg:71f0 Size:256 Owner:0xd8e +++++ +Seg:72f0 Size:256 Owner:0xd90 +++++ +Seg:73f0 Size:256 Owner:0xd92 +++++ +Seg:74f0 Size:256 Owner:0xd94 +++++ +Seg:75f0 Size:256 Owner:0xd96 +++++ +Seg:76f0 Size:256 Owner:0xd98 +++++ +Seg:77f0 Size:256 Owner:0xd9a +++++ +Seg:78f0 Size:256 Owner:0xd9c +++++ +Seg:79f0 Size:273 Owner:0xfde +++++ +Seg:9fde Size:32802 Owner:0x0 + +Seg:9ffe Size:24577 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/DEBUG.16W b/DEBUG.16W index 4ca891ca..e889f155 100755 --- a/DEBUG.16W +++ b/DEBUG.16W @@ -1,210 +1,210 @@ -Seg:0 Size:10194 Owner:0x0 +Seg:0 Size:10182 Owner:0x0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++0 -Seg:27d2 Size:256 Owner:0x1938 +Seg:27c6 Size:256 Owner:0x1938 ++++ -Seg:2934 Size:44 Owner:0x0 +Seg:2928 Size:44 Owner:0x0 ++ -Seg:2960 Size:256 Owner:0x1726 +Seg:2954 Size:256 Owner:0x1726 ++++ -Seg:2a60 Size:256 Owner:0x1728 +Seg:2a54 Size:256 Owner:0x1728 ++++ -Seg:2b60 Size:256 Owner:0x172a +Seg:2b54 Size:256 Owner:0x172a ++++ -Seg:2c60 Size:256 Owner:0x172c +Seg:2c54 Size:256 Owner:0x172c ++++++ +Seg:2d54 Size:256 Owner:0x172e ++++ -Seg:2d60 Size:256 Owner:0x172e +Seg:2e54 Size:256 Owner:0x1730 ++++ -Seg:2e60 Size:256 Owner:0x1730 +Seg:2f54 Size:256 Owner:0x1732 ++++ -Seg:2f60 Size:256 Owner:0x1732 +Seg:3054 Size:256 Owner:0x1734 ++++ -Seg:3060 Size:256 Owner:0x1734 +Seg:3154 Size:256 Owner:0x1736 ++++++ +Seg:3254 Size:256 Owner:0x1738 ++++ -Seg:3160 Size:256 Owner:0x1736 +Seg:3354 Size:256 Owner:0x173a ++++ -Seg:3260 Size:256 Owner:0x1738 +Seg:3454 Size:256 Owner:0x173c ++++ -Seg:3360 Size:256 Owner:0x173a +Seg:3554 Size:256 Owner:0x173e ++++ -Seg:3460 Size:256 Owner:0x173c +Seg:3654 Size:256 Owner:0x1740 ++++++ +Seg:3754 Size:256 Owner:0x1742 ++++ -Seg:3560 Size:256 Owner:0x173e +Seg:3854 Size:256 Owner:0x1744 ++++ -Seg:3660 Size:256 Owner:0x1740 +Seg:3954 Size:256 Owner:0x1746 ++++ -Seg:3760 Size:256 Owner:0x1742 +Seg:3a54 Size:256 Owner:0x1748 ++++ -Seg:3860 Size:256 Owner:0x1744 +Seg:3b54 Size:256 Owner:0x174a ++++++ +Seg:3c54 Size:256 Owner:0x174c ++++ -Seg:3960 Size:256 Owner:0x1746 +Seg:3d54 Size:256 Owner:0x174e ++++ -Seg:3a60 Size:256 Owner:0x1748 +Seg:3e54 Size:256 Owner:0x1750 ++++ -Seg:3b60 Size:256 Owner:0x174a +Seg:3f54 Size:256 Owner:0x1752 ++++ -Seg:3c60 Size:256 Owner:0x174c +Seg:4054 Size:256 Owner:0x1754 ++++++ +Seg:4154 Size:256 Owner:0x1756 ++++ -Seg:3d60 Size:256 Owner:0x174e +Seg:4254 Size:256 Owner:0x1758 ++++ -Seg:3e60 Size:256 Owner:0x1750 +Seg:4354 Size:256 Owner:0x175a ++++ -Seg:3f60 Size:256 Owner:0x1752 +Seg:4454 Size:256 Owner:0x175c ++++ -Seg:4060 Size:256 Owner:0x1754 +Seg:4554 Size:256 Owner:0x175e ++++++ +Seg:4654 Size:256 Owner:0x1760 ++++ -Seg:4160 Size:256 Owner:0x1756 +Seg:4754 Size:256 Owner:0x1762 ++++ -Seg:4260 Size:256 Owner:0x1758 +Seg:4854 Size:256 Owner:0x1764 ++++ -Seg:4360 Size:256 Owner:0x175a +Seg:4954 Size:256 Owner:0x1766 ++++ -Seg:4460 Size:256 Owner:0x175c +Seg:4a54 Size:256 Owner:0x1768 ++++++ +Seg:4b54 Size:256 Owner:0x176a ++++ -Seg:4560 Size:256 Owner:0x175e +Seg:4c54 Size:256 Owner:0x176c ++++ -Seg:4660 Size:256 Owner:0x1760 +Seg:4d54 Size:256 Owner:0x176e ++++ -Seg:4760 Size:256 Owner:0x1762 +Seg:4e54 Size:256 Owner:0x1770 ++++ -Seg:4860 Size:256 Owner:0x1764 +Seg:4f54 Size:256 Owner:0x1772 ++++++ +Seg:5054 Size:256 Owner:0x1774 ++++ -Seg:4960 Size:256 Owner:0x1766 +Seg:5154 Size:256 Owner:0x1776 ++++ -Seg:4a60 Size:256 Owner:0x1768 +Seg:5254 Size:256 Owner:0x1778 ++++ -Seg:4b60 Size:256 Owner:0x176a +Seg:5354 Size:256 Owner:0x177a ++++ -Seg:4c60 Size:256 Owner:0x176c +Seg:5454 Size:256 Owner:0x177c ++++++ +Seg:5554 Size:256 Owner:0x177e ++++ -Seg:4d60 Size:256 Owner:0x176e +Seg:5654 Size:256 Owner:0x1780 ++++ -Seg:4e60 Size:256 Owner:0x1770 +Seg:5754 Size:256 Owner:0x1782 ++++ -Seg:4f60 Size:256 Owner:0x1772 +Seg:5854 Size:256 Owner:0x1784 ++++ -Seg:5060 Size:256 Owner:0x1774 +Seg:5954 Size:256 Owner:0x1786 ++++++ +Seg:5a54 Size:256 Owner:0x1788 ++++ -Seg:5160 Size:256 Owner:0x1776 +Seg:5b54 Size:256 Owner:0x178a ++++ -Seg:5260 Size:256 Owner:0x1778 +Seg:5c54 Size:256 Owner:0x178c ++++ -Seg:5360 Size:256 Owner:0x177a +Seg:5d54 Size:256 Owner:0x178e ++++ -Seg:5460 Size:256 Owner:0x177c +Seg:5e54 Size:256 Owner:0x1790 ++++++ +Seg:5f54 Size:256 Owner:0x1792 ++++ -Seg:5560 Size:256 Owner:0x177e +Seg:6054 Size:256 Owner:0x1794 ++++ -Seg:5660 Size:256 Owner:0x1780 +Seg:6154 Size:256 Owner:0x1796 ++++ -Seg:5760 Size:256 Owner:0x1782 +Seg:6254 Size:256 Owner:0x1798 ++++ -Seg:5860 Size:256 Owner:0x1784 +Seg:6354 Size:256 Owner:0x179a ++++++ +Seg:6454 Size:256 Owner:0x179c ++++ -Seg:5960 Size:256 Owner:0x1786 +Seg:6554 Size:256 Owner:0x179e ++++ -Seg:5a60 Size:256 Owner:0x1788 +Seg:6654 Size:256 Owner:0x17a0 ++++ -Seg:5b60 Size:256 Owner:0x178a +Seg:6754 Size:256 Owner:0x17a2 ++++ -Seg:5c60 Size:256 Owner:0x178c +Seg:6854 Size:256 Owner:0x17a4 ++++++ +Seg:6954 Size:256 Owner:0x17a6 ++++ -Seg:5d60 Size:256 Owner:0x178e +Seg:6a54 Size:256 Owner:0x17a8 ++++ -Seg:5e60 Size:256 Owner:0x1790 +Seg:6b54 Size:256 Owner:0x17aa ++++ -Seg:5f60 Size:256 Owner:0x1792 +Seg:6c54 Size:256 Owner:0x17ac ++++ -Seg:6060 Size:256 Owner:0x1794 +Seg:6d54 Size:256 Owner:0x17ae ++++++ +Seg:6e54 Size:256 Owner:0x17b0 ++++ -Seg:6160 Size:256 Owner:0x1796 +Seg:6f54 Size:256 Owner:0x17b2 ++++ -Seg:6260 Size:256 Owner:0x1798 +Seg:7054 Size:256 Owner:0x17b4 ++++ -Seg:6360 Size:256 Owner:0x179a +Seg:7154 Size:256 Owner:0x17b6 ++++ -Seg:6460 Size:256 Owner:0x179c +Seg:7254 Size:256 Owner:0x17b8 ++++++ +Seg:7354 Size:256 Owner:0x17ba ++++ -Seg:6560 Size:256 Owner:0x179e +Seg:7454 Size:256 Owner:0x17bc ++++ -Seg:6660 Size:256 Owner:0x17a0 +Seg:7554 Size:256 Owner:0x17be ++++ -Seg:6760 Size:256 Owner:0x17a2 +Seg:7654 Size:256 Owner:0x17c0 ++++ -Seg:6860 Size:256 Owner:0x17a4 +Seg:7754 Size:256 Owner:0x17c2 ++++++ +Seg:7854 Size:256 Owner:0x17c4 ++++ -Seg:6960 Size:256 Owner:0x17a6 +Seg:7954 Size:256 Owner:0x17c6 ++++ -Seg:6a60 Size:256 Owner:0x17a8 +Seg:7a54 Size:256 Owner:0x17c8 ++++ -Seg:6b60 Size:256 Owner:0x17aa +Seg:7b54 Size:256 Owner:0x17ca ++++ -Seg:6c60 Size:256 Owner:0x17ac +Seg:7c54 Size:256 Owner:0x17cc ++++++ +Seg:7d54 Size:256 Owner:0x17ce ++++ -Seg:6d60 Size:256 Owner:0x17ae +Seg:7e54 Size:256 Owner:0x17d0 ++++ -Seg:6e60 Size:256 Owner:0x17b0 +Seg:7f54 Size:256 Owner:0x17d2 ++++ -Seg:6f60 Size:256 Owner:0x17b2 +Seg:8054 Size:256 Owner:0x17d4 ++++ -Seg:7060 Size:256 Owner:0x17b4 +Seg:8154 Size:256 Owner:0x17d6 ++++++ +Seg:8254 Size:256 Owner:0x17d8 ++++ -Seg:7160 Size:256 Owner:0x17b6 +Seg:8354 Size:256 Owner:0x17da ++++ -Seg:7260 Size:256 Owner:0x17b8 +Seg:8454 Size:256 Owner:0x17dc ++++ -Seg:7360 Size:256 Owner:0x17ba +Seg:8554 Size:256 Owner:0x17de ++++ -Seg:7460 Size:256 Owner:0x17bc +Seg:8654 Size:256 Owner:0x17e0 ++++++ +Seg:8754 Size:256 Owner:0x17e2 ++++ -Seg:7560 Size:256 Owner:0x17be +Seg:8854 Size:256 Owner:0x17e4 ++++ -Seg:7660 Size:256 Owner:0x17c0 +Seg:8954 Size:256 Owner:0x17e6 ++++ -Seg:7760 Size:256 Owner:0x17c2 +Seg:8a54 Size:256 Owner:0x17e8 ++++ -Seg:7860 Size:256 Owner:0x17c4 +Seg:8b54 Size:256 Owner:0x17ea ++++++ +Seg:8c54 Size:256 Owner:0x17ec ++++ -Seg:7960 Size:256 Owner:0x17c6 -++++ -Seg:7a60 Size:256 Owner:0x17c8 -++++ -Seg:7b60 Size:256 Owner:0x17ca -++++ -Seg:7c60 Size:256 Owner:0x17cc -++++ -Seg:7d60 Size:256 Owner:0x17ce -++++ -Seg:7e60 Size:256 Owner:0x17d0 -++++ -Seg:7f60 Size:256 Owner:0x17d2 -++++ -Seg:8060 Size:256 Owner:0x17d4 -++++ -Seg:8160 Size:256 Owner:0x17d6 -++++ -Seg:8260 Size:256 Owner:0x17d8 -++++ -Seg:8360 Size:256 Owner:0x17da -++++ -Seg:8460 Size:256 Owner:0x17dc -++++ -Seg:8560 Size:256 Owner:0x17de -++++ -Seg:8660 Size:256 Owner:0x17e0 -++++ -Seg:8760 Size:256 Owner:0x17e2 -++++ -Seg:8860 Size:256 Owner:0x17e4 -++++ -Seg:8960 Size:256 Owner:0x17e6 -++++ -Seg:8a60 Size:256 Owner:0x17e8 -++++ -Seg:8b60 Size:256 Owner:0x17ea -++++ -Seg:8c60 Size:256 Owner:0x17ec -++++ -Seg:8d60 Size:273 Owner:0xe4c0 +Seg:8d54 Size:273 Owner:0xe4c0 ++++ -Seg:b960 Size:18079 Owner:0x0 +Seg:b954 Size:18091 Owner:0x0 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ \ No newline at end of file diff --git a/HEAP.16W b/HEAP.16W index f6f9f3a2..29f7df77 100755 --- a/HEAP.16W +++ b/HEAP.16W @@ -1,35 +1,35 @@ == default == - USED block at 29560016 of size 66 - USED block at 29560058 of size 66 - FREE block at 2956009a of size 18 - USED block at 295600ac of size 136 - USED block at 29560134 of size 20 - FREE block at 29560148 of size 7860 + USED block at 294a0016 of size 66 + USED block at 294a0058 of size 66 + FREE block at 294a009a of size 18 + USED block at 294a00ac of size 136 + USED block at 294a0134 of size 20 + FREE block at 294a0148 of size 7860 OK - end of heap == near == - USED block at 1955e4f6 of size 12 - USED block at 1955e502 of size 530 - USED block at 1955e714 of size 72 - USED block at 1955e75c of size 20 - USED block at 1955e770 of size 20 - USED block at 1955e784 of size 20 - USED block at 1955e798 of size 20 - USED block at 1955e7ac of size 20 - USED block at 1955e7c0 of size 6204 + USED block at 1949e4f6 of size 12 + USED block at 1949e502 of size 530 + USED block at 1949e714 of size 72 + USED block at 1949e75c of size 20 + USED block at 1949e770 of size 20 + USED block at 1949e784 of size 20 + USED block at 1949e798 of size 20 + USED block at 1949e7ac of size 20 + USED block at 1949e7c0 of size 6204 OK - end of heap == far == - USED block at 29560016 of size 66 - USED block at 29560058 of size 66 - USED block at 2956009a of size 18 - USED block at 295600ac of size 136 - USED block at 29560134 of size 20 - USED block at 29560148 of size 7860 + USED block at 294a0016 of size 66 + USED block at 294a0058 of size 66 + USED block at 294a009a of size 18 + USED block at 294a00ac of size 136 + USED block at 294a0134 of size 20 + USED block at 294a0148 of size 7860 OK - end of heap Memory Type Total Used Free diff --git a/MMDUMP.16B b/MMDUMP.16B index 9d3a83c8..f11d1f40 100755 Binary files a/MMDUMP.16B and b/MMDUMP.16B differ diff --git a/TC0001.SWP b/TC0001.SWP new file mode 100755 index 00000000..0ddc1c82 Binary files /dev/null and b/TC0001.SWP differ diff --git a/bcexmm.dsk b/bcexmm.dsk index 1fb336b1..e1d0305c 100755 Binary files a/bcexmm.dsk and b/bcexmm.dsk differ diff --git a/bcexmm.exe b/bcexmm.exe index 321b7912..c11e9410 100755 Binary files a/bcexmm.exe and b/bcexmm.exe differ diff --git a/bcexmm.prj b/bcexmm.prj index f3336226..bf1d7a44 100755 Binary files a/bcexmm.prj and b/bcexmm.prj differ diff --git a/src/lib/16_head.c b/src/lib/16_head.c index 6c6eaee6..e56baa94 100755 --- a/src/lib/16_head.c +++ b/src/lib/16_head.c @@ -22,22 +22,6 @@ #include "src/lib/16_head.h" -/* Function: Wait ********************************************************** -* -* Parameters: wait - time in microseconds -* -* Description: pauses for a specified number of microseconds. -* -*/ -void wait(clock_t wait){ - clock_t goal; - - if(!wait) return; - - goal = wait + clock(); - while((goal > clock()) && !kbhit()) ; -} /* End of wait */ - long int filesize(FILE *fp) { @@ -133,7 +117,9 @@ void Quit (char *error) { //movedata ((unsigned)screen,7,0xb800,0,7*160); //gotoxy (10,4); + printf("\n"); puts(error); + printf("\n"); //gotoxy (1,8); exit(1); } diff --git a/src/lib/16_head.h b/src/lib/16_head.h index aab4c033..6b189d87 100755 --- a/src/lib/16_head.h +++ b/src/lib/16_head.h @@ -28,8 +28,8 @@ #error i8088 only #endif -#ifndef _LIBHEAD_H_ -#define _LIBHEAD_H_ +#ifndef __16_HEAD_H__ +#define __16_HEAD_H__ #include #include #include @@ -43,12 +43,19 @@ #include #include #include +#include +#include #ifdef __WATCOMC__ #include #include #include #include //16_vrs.h #endif +#ifdef __BORLANDC__ +#include +#include +#define TILEWH 16 +#endif #include "src/lib/nyan/kitten.h" #include "src/lib/types.h" #include "src/lib/typdefst.h" @@ -192,8 +199,6 @@ typedef union REGPACK regs_t; #define INPUT_STATUS_1 0x03da /* local function */ -void wait(clock_t wait); - long int filesize(FILE *fp); void printmeminfoline(byte *strc, const byte *pee, size_t h_total, size_t h_used, size_t h_free); int US_CheckParm(char *parm,char **strings); @@ -202,4 +207,4 @@ void Quit (char *error); #endif byte dirchar(byte in); -#endif/*_LIBHEAD_H_*/ +#endif/*__16_HEAD_H__*/ diff --git a/src/lib/16_in.c b/src/lib/16_in.c index 8c0dbc69..619affd8 100755 --- a/src/lib/16_in.c +++ b/src/lib/16_in.c @@ -166,6 +166,7 @@ static Direction DirTable[] = // Quick lookup for total direction #endif // Internal routines + /////////////////////////////////////////////////////////////////////////// // // INL_KeyService() - Handles a keyboard interrupt (key up/down) @@ -245,9 +246,13 @@ static boolean special; void Mouse(int x) { - union REGS CPURegs; - x = CPURegs.x.ax; - int86(MouseInt,&CPURegs,&CPURegs); + //union REGS CPURegs; + //x = CPURegs.x.ax; + __asm { + mov ax,x + int MouseInt + } + //int86(MouseInt,&CPURegs,&CPURegs); } /////////////////////////////////////////////////////////////////////////// @@ -301,8 +306,7 @@ IN_GetJoyAbs(word joy,word *xp,word *yp) yb = 1 << ys; // Read the absolute joystick values - __asm - { + __asm { pushf // Save some registers push si push di @@ -322,8 +326,13 @@ IN_GetJoyAbs(word joy,word *xp,word *yp) push bp // Don't mess up stack frame mov bp,MaxJoyValue - +#ifdef __BORLANDC__ + } +#endif loo: +#ifdef __BORLANDC__ + __asm { +#endif in al,dx // Get bits indicating whether all are finished dec bp // Check bounding register @@ -340,8 +349,13 @@ loo: add cl,bl jnz loo // If both bits were 0, drop out - +#ifdef __BORLANDC__ + } +#endif done: +#ifdef __BORLANDC__ + __asm { +#endif pop bp mov cl,[xs] // Get the number of bits to shift @@ -639,9 +653,23 @@ IN_Startup() checkjoys = true; checkmouse = true; - for (i = 1;i < __argc;i++) + for (i = 1;i < +#ifdef __WATCOMC__ + __argc +#endif +#ifdef __BORLANDC__ + _argc +#endif + ;i++) { - switch (US_CheckParm(__argv[i],ParmStringsIN)) + switch (US_CheckParm( +#ifdef __WATCOMC__ + __argv[i] +#endif +#ifdef __BORLANDC__ + _argv[i] +#endif + ,ParmStringsIN)) { case 0: checkjoys = false; diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h index 2a344aee..b68eea9c 100755 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -53,6 +53,7 @@ extern boolean dbg_debugpm; //-------- #define EMS_INT 0x67 +#define EMM_INT 0x21 #define EMS_STATUS 0x40 #define EMS_GETFRAME 0x41 diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c index ff997f7d..0d1e2bf9 100755 --- a/src/lib/16_pm.c +++ b/src/lib/16_pm.c @@ -155,13 +155,13 @@ PML_StartupEMS(global_game_variables_t *gvar) __asm { mov dx,OFFSET emmname //fix by andrius4669 mov ax,0x3d00 - int EMS_INT // try to open EMMXXXX0 device + int EMM_INT // try to open EMMXXXX0 device jc error1 mov bx,ax mov ax,0x4400 - int EMS_INT // get device info + int EMM_INT // get device info jc error1 and dx,0x80 @@ -169,13 +169,13 @@ PML_StartupEMS(global_game_variables_t *gvar) mov ax,0x4407 - int EMS_INT // get status + int EMM_INT // get status jc error1 or al,al jz error1 mov ah,0x3e - int EMS_INT // close handle + int EMM_INT // close handle jc error1 mov ah,EMS_STATUS diff --git a/src/lib/16_tail.c b/src/lib/16_tail.c index 6d66ec1c..47ef9b7b 100755 --- a/src/lib/16_tail.c +++ b/src/lib/16_tail.c @@ -37,6 +37,7 @@ void Startup16(global_game_variables_t *gvar) { +#ifdef __WATCOMC__ // DOSLIB: check our environment probe_dos(); @@ -57,7 +58,7 @@ void Startup16(global_game_variables_t *gvar) printf("This program requires VGA or higher graphics hardware\n"); return; } - +#endif gvar->mm.mmstarted=0; gvar->pm.PMStarted=0; MM_Startup(gvar);