bcexmm compiles again ^^

diff --git a/DEBUG.16B b/DEBUG.16B
index ee36ee43cd7dc28e890b0ffb64da82db95a23d65..b74e83065cf751f187c79928a0372d98abe241eb 100755 (executable)
--- a/DEBUG.16B
+++ b/DEBUG.16B
@@ -1,12 +1,12 @@
-\e[0mSeg:0      Size:3871       Owner:0x0\r
-\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
+\e[0mSeg:0      Size:2882       Owner:0x6e69\r
+\e[41;31m+++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m0\r
-\e[0m\e[0mSeg:f1f        Size:256        Owner:0xe8\r
+\e[0m\e[0mSeg:b42        Size:256        Owner:0xcf80\r
 \e[44;34m++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r
-\e[0m\e[0mSeg:101f       Size:273        Owner:0xfe0\r
+\e[0m\e[0mSeg:c42        Size:273        Owner:0xfe0\r
 \e[44;34m++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
+\e[42;32m00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
 \e[0m\e[0mSeg:9fde       Size:28706      Owner:0x0\r
 \e[41;31m\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r

diff --git a/MEMINFO.16B b/MEMINFO.16B
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/MMDUMP.16B b/MMDUMP.16B
index 72cc22e09e2891674490924ed0e0cbc2c33b4e29..44ec557b25ef3d53d1c3afc7d3b2b7e82986c52b 100755 (executable)
Binary files a/MMDUMP.16B and b/MMDUMP.16B differ

diff --git a/bcexmm.exe b/bcexmm.exe
index a9d855681e14ed855900deadeaeb7c5578cef6ab..136f4d757984e9680ece0cf3f16385385b37fe62 100755 (executable)
Binary files a/bcexmm.exe and b/bcexmm.exe differ

diff --git a/bcexmm.prj b/bcexmm.prj
index 90eb12de44a5c5ddd9835d8b32c337b81d9cc80c..792a4f393b58ef69aae77dc9f709f4e97de069e4 100755 (executable)
Binary files a/bcexmm.prj and b/bcexmm.prj differ

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 35644b35dbb233e9358f36e856722f8f0673c874..e2b6cef9a1ec70871a1e41eb800fb12d5170b745 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -532,9 +532,8 @@ void CAL_HuffExpand (byte huge *source, byte huge *dest,
 // expand less than 64k of data\r
 //--------------------------\r
 \r
-       __asm\r
-       {\r
-;;;;;          mov     bx,[headptr]\r
+       __asm {\r
+////           mov     bx,[headptr]\r
 \r
                mov     si,[sourceoff]\r
                mov     di,[destoff]\r
@@ -545,35 +544,60 @@ void CAL_HuffExpand (byte huge *source, byte huge *dest,
                mov     ch,[si]                         // load first byte\r
                inc     si\r
                mov     cl,1\r
-\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 expandshort:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                test    ch,cl                   // bit set?\r
                jnz     bit1short\r
                mov     dx,[ss:bx]                      // take bit0 path from node\r
                shl     cl,1                            // advance to next bit position\r
                jc      newbyteshort\r
                jnc     sourceupshort\r
-\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 bit1short:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                mov     dx,[ss:bx+2]            // take bit1 path\r
                shl     cl,1                            // advance to next bit position\r
                jnc     sourceupshort\r
-\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 newbyteshort:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                mov     ch,[si]                         // load next byte\r
                inc     si\r
                mov     cl,1                            // back to first bit\r
-\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 sourceupshort:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                or      dh,dh                           // if dx<256 its a byte, else move node\r
                jz      storebyteshort\r
                mov     bx,dx                           // next node = (huffnode *)code\r
                jmp     expandshort\r
-\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 storebyteshort:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                mov     [es:di],dl\r
                inc     di                                      // write a decopmpressed byte out\r
-;;;;           mov     bx,[headptr]            // back to the head node for next bit\r
+////           mov     bx,[headptr]            // back to the head node for next bit\r
 \r
                cmp     di,ax                           // done?\r
                jne     expandshort\r
@@ -588,9 +612,8 @@ storebyteshort:
 \r
   length--;\r
 \r
-       __asm\r
-       {\r
-;;;;           mov     bx,[headptr]\r
+       __asm {\r
+////           mov     bx,[headptr]\r
                mov     cl,1\r
 \r
                mov     si,[sourceoff]\r
@@ -599,16 +622,32 @@ storebyteshort:
                mov     ds,[sourceseg]\r
 \r
                lodsb                   // load first byte\r
-\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 expand:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                test    al,cl           // bit set?\r
                jnz     bit1\r
                mov     dx,[ss:bx]      // take bit0 path from node\r
                jmp     gotcode\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 bit1:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                mov     dx,[ss:bx+2]    // take bit1 path\r
-\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 gotcode:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                shl     cl,1            // advance to next bit position\r
                jnc     sourceup\r
                lodsb\r
@@ -618,19 +657,35 @@ gotcode:
                inc     cx\r
                mov     ds,cx\r
                xor     si,si\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 sinorm:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                mov     cl,1            // back to first bit\r
-\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 sourceup:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                or      dh,dh           // if dx<256 its a byte, else move node\r
                jz      storebyte\r
                mov     bx,dx           // next node = (huffnode *)code\r
                jmp     expand\r
-\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 storebyte:\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                mov     [es:di],dl\r
                inc     di              // write a decopmpressed byte out\r
-;;;;           mov     bx,[headptr]    // back to the head node for next bit\r
+////           mov     bx,[headptr]    // back to the head node for next bit\r
 \r
                cmp     di,0x10         // normalize es:di\r
                jb      dinorm\r
@@ -638,8 +693,13 @@ storebyte:
                inc     dx\r
                mov     es,dx\r
                xor     di,di\r
+#ifdef __BORLANDC__\r
+       }\r
+#endif\r
 dinorm:\r
-\r
+#ifdef __BORLANDC__\r
+       __asm {\r
+#endif\r
                sub     [WORD PTR ss:length],1\r
                jnc     expand\r
                dec     [WORD PTR ss:length+2]\r
@@ -647,8 +707,7 @@ dinorm:
        }\r
        }\r
 \r
-       __asm\r
-       {\r
+       __asm {\r
                mov     ax,ss\r
                mov     ds,ax\r
        }\r

diff --git a/src/lib/16_head.h b/src/lib/16_head.h
index 71e861cef94917d1f19c50aa659064e6fcdbe1c2..74822da2d4db5b2b87d315b21ad67ac9076e1b20 100755 (executable)
--- a/src/lib/16_head.h
+++ b/src/lib/16_head.h
@@ -155,6 +155,7 @@ extern      int                     profilehandle,debughandle;      //make it into game global
 #define        nil     ((void *)0)\r
 #ifdef __BORLANDC__\r
 #define _FCORELEFT 0x90000UL-16UL\r
+#define sprite\r
 #endif\r
 #ifdef __WATCOMC__\r
 #define _FCORELEFT 0x90000UL+16UL\r