somewhat ported!

	modified:   makefile
	modified:   src/exmmtest.c
	modified:   src/lib/16_ca.c
	modified:   src/lib/16_ca.h

diff --git a/makefile b/makefile
index 000a0b5..8a85675 100644 (file)
--- a/makefile
+++ b/makefile
@@ -22,7 +22,7 @@ JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
-16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)
+16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ) 16_ca.$(OBJ)
 GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)
 
 all: 16.exe test.exe pcxtest.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
@@ -157,6 +157,9 @@ mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
 16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c
        wcl $(FLAGS) -c $(SRCLIB)16_mm.c
 
+16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c
+       wcl $(FLAGS) -c $(SRCLIB)16_ca.c
+
 16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
        wcl $(FLAGS) -c $(SRCLIB)16_head.c
 

diff --git a/src/exmmtest.c b/src/exmmtest.c
index d107e4c..f6fcd50 100644 (file)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -22,6 +22,7 @@
 /*
        input test
 */
+#include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
 
 void

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index c5d983f..bb65c4a 100644 (file)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -29,8 +29,8 @@ loaded into the data segment
 \r
 =============================================================================\r
 */\r
-\r
-#include "src/lib/16_head.h"\r
+
+#include "src/lib/16_ca.h"\r
 //#include "ID_STRS.H"\r
 \r
 //#define THREEBYTEGRSTARTS\r
@@ -129,12 +129,11 @@ SDMode            oldsoundmode;
 void   CAL_DialogDraw (char *title,unsigned numcache);\r
 void   CAL_DialogUpdate (void);\r
 void   CAL_DialogFinish (void);*/\r
-void   CAL_CarmackExpand (unsigned far *source, unsigned far *dest,\r
-               unsigned length);\r
+//void CAL_CarmackExpand (unsigned far *source, unsigned far *dest,unsigned length);\r
 \r
 \r
-/*#ifdef THREEBYTEGRSTARTS\r
-#define FILEPOSSIZE    3*/\r
+/*++++#ifdef THREEBYTEGRSTARTS\r
+#define FILEPOSSIZE    3\r
 //#define      GRFILEPOS(c) (*(long far *)(((byte far *)grstarts)+(c)*3)&0xffffff)\r
 long GRFILEPOS(int c)\r
 {\r
@@ -155,7 +154,7 @@ long GRFILEPOS(int c)
 #else\r
 #define FILEPOSSIZE    4\r
 #define        GRFILEPOS(c) (grstarts[c])\r
-#endif\r
+#endif*/\r
 \r
 /*\r
 =============================================================================\r
@@ -174,17 +173,17 @@ long GRFILEPOS(int c)
 =\r
 ============================\r
 */\r
-\r
-void CA_OpenDebug (void)\r
+/*++++\r
+void CA_OpenDebug(void)\r
 {\r
-       unlink ("DEBUG.TXT");\r
+       unlink("DEBUG.TXT");\r
        debughandle = open("DEBUG.TXT", O_CREAT | O_WRONLY | O_TEXT);\r
 }\r
 \r
-void CA_CloseDebug (void)\r
+void CA_CloseDebug(void)\r
 {\r
-       close (debughandle);\r
-}\r
+       close debughandle);\r
+}*/\r
 \r
 \r
 \r
@@ -198,13 +197,13 @@ void CA_CloseDebug (void)
 =\r
 ============================\r
 */\r
-\r
+/*++++\r
 void CAL_GetGrChunkLength (int chunk)\r
 {\r
        lseek(grhandle,GRFILEPOS(chunk),SEEK_SET);\r
        read(grhandle,&chunkexplen,sizeof(chunkexplen));\r
        chunkcomplen = GRFILEPOS(chunk+1)-GRFILEPOS(chunk)-4;\r
-}\r
+}*/\r
 \r
 \r
 /*\r
@@ -217,9 +216,9 @@ void CAL_GetGrChunkLength (int chunk)
 ==========================\r
 */\r
 \r
-boolean CA_FarRead (int handle, byte far *dest, long length)\r
+boolean CA_FarRead (int handle, byte far *dest, dword length)\r
 {
-       union REGS CPURegs;\r
+       boolean flag;\r
        if (length>0xffffl)\r
                printf("CA_FarRead doesn't support 64K reads yet!\n");\r
 
@@ -234,18 +233,20 @@ boolean CA_FarRead (int handle, byte far *dest, long length)
                int     21h\r
                pop     ds\r
                jnc     good
-       }\r
-       errno = CPURegs.x.ax;\r
-       return  false;
-       __asm
-       {\r
+               mov     errno,ax
+               mov     flag,0
+               jmp End
 good:\r
                cmp     ax,[WORD PTR length]\r
                je      done\r
-               errno = EINVFMT;                        // user manager knows this is bad read\r
-       return  false;\r
-done:\r
-       return  true;\r
+//             errno = EINVFMT;                        // user manager knows this is bad read\r
+               mov     flag,0
+               jmp End
+done:
+               mov     flag,1
+End:
+       }\r
+       return flag;\r
 }\r
 \r
 \r
@@ -259,30 +260,37 @@ done:
 ==========================\r
 */\r
 \r
-boolean CA_FarWrite (int handle, byte far *source, long length)\r
-{\r
+boolean CA_FarWrite (int handle, byte far *source, dword length)\r
+{
+       boolean flag;\r
        if (length>0xffffl)\r
-               Quit ("CA_FarWrite doesn't support 64K reads yet!");\r
-\r
-asm            push    ds\r
-asm            mov     bx,[handle]\r
-asm            mov     cx,[WORD PTR length]\r
-asm            mov     dx,[WORD PTR source]\r
-asm            mov     ds,[WORD PTR source+2]\r
-asm            mov     ah,0x40                 // WRITE w/handle\r
-asm            int     21h\r
-asm            pop     ds\r
-asm            jnc     good\r
-       errno = _AX;\r
-       return  false;\r
-good:\r
-asm            cmp     ax,[WORD PTR length]\r
-asm            je      done\r
-       errno = ENOMEM;                         // user manager knows this is bad write\r
-       return  false;\r
+               printf("CA_FarWrite doesn't support 64K reads yet!\n");
 \r
-done:\r
-       return  true;\r
+       __asm
+       {\r
+               push    ds\r
+               mov     bx,[handle]\r
+               mov     cx,[WORD PTR length]\r
+               mov     dx,[WORD PTR source]\r
+               mov     ds,[WORD PTR source+2]\r
+               mov     ah,0x40                 // WRITE w/handle\r
+               int     21h\r
+               pop     ds\r
+               jnc     good
+               mov     errno,ax\r
+               mov flag,0
+               jmp End\r
+good:\r
+               cmp     ax,[WORD PTR length]\r
+               je      done\r
+       //errno = ENOMEM;                               // user manager knows this is bad write
+               mov     flag,0
+               jmp End\r
+done:
+               mov     flag,1
+End:\r
+       }
+       return flag;\r
 }\r
 \r
 \r
@@ -296,21 +304,21 @@ done:
 ==========================\r
 */\r
 \r
-boolean CA_ReadFile (char *filename, memptr *ptr)\r
+boolean CA_ReadFile(char *filename, memptr *ptr)\r
 {\r
        int handle;\r
-       long size;\r
+       dword size;\r
 \r
-       if ((handle = open(filename,O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
+       if((handle = open(filename,O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                return false;\r
 \r
-       size = filelength (handle);\r
-       if (!CA_FarRead (handle,*ptr,size))\r
+       size = filelength(handle);\r
+       if(!CA_FarRead(handle,*ptr,size))\r
        {\r
-               close (handle);\r
+               close(handle);\r
                return false;\r
        }\r
-       close (handle);\r
+       close(handle);\r
        return true;\r
 }\r
 \r
@@ -326,22 +334,22 @@ boolean CA_ReadFile (char *filename, memptr *ptr)
 ==========================\r
 */\r
 \r
-boolean CA_LoadFile (char *filename, memptr *ptr)\r
+boolean CA_LoadFile(char *filename, memptr *ptr)\r
 {\r
        int handle;\r
        long size;\r
 \r
-       if ((handle = open(filename,O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
+       if((handle = open(filename,O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                return false;\r
 \r
        size = filelength (handle);\r
        MM_GetPtr (ptr,size);\r
-       if (!CA_FarRead (handle,*ptr,size))\r
+       if(!CA_FarRead (handle,*ptr,size))\r
        {\r
                close (handle);\r
                return false;\r
        }\r
-       close (handle);\r
+       close(handle);\r
        return true;\r
 }\r
 \r
@@ -395,7 +403,7 @@ void CAL_OptimizeNodes(huffnode *table)
 ======================\r
 */\r
 \r
-void CAL_HuffExpand (byte huge *source, byte huge *dest,\r
+/*++++void CAL_HuffExpand (byte huge *source, byte huge *dest,\r
   long length,huffnode *hufftable)\r
 {\r
 //  unsigned bit,byte,node,code;\r
@@ -428,26 +436,28 @@ void CAL_HuffExpand (byte huge *source, byte huge *dest,
 //--------------------------\r
 // expand less than 64k of data\r
 //--------------------------\r
+
+       __asm
+       {\r
+               mov     bx,[headptr]\r
 \r
-asm mov        bx,[headptr]\r
-\r
-asm    mov     si,[sourceoff]\r
-asm    mov     di,[destoff]\r
-asm    mov     es,[destseg]\r
-asm    mov     ds,[sourceseg]\r
-asm    mov     ax,[endoff]\r
+               mov     si,[sourceoff]\r
+               mov     di,[destoff]\r
+               mov     es,[destseg]\r
+               mov     ds,[sourceseg]\r
+               mov     ax,[endoff]\r
 \r
-asm    mov     ch,[si]                         // load first byte\r
-asm    inc     si\r
-asm    mov     cl,1\r
+               mov     ch,[si]                         // load first byte\r
+               inc     si\r
+               mov     cl,1\r
 \r
 expandshort:\r
-asm    test    ch,cl                   // bit set?\r
-asm    jnz     bit1short\r
-asm    mov     dx,[ss:bx]                      // take bit0 path from node\r
-asm    shl     cl,1                            // advance to next bit position\r
-asm    jc      newbyteshort\r
-asm    jnc     sourceupshort\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
 bit1short:\r
 asm    mov     dx,[ss:bx+2]            // take bit1 path\r
@@ -471,7 +481,8 @@ asm inc     di                                      // write a decopmpressed byte out
 asm    mov     bx,[headptr]            // back to the head node for next bit\r
 \r
 asm    cmp     di,ax                           // done?\r
-asm    jne     expandshort\r
+asm    jne     expandshort
+       }\r
        }\r
        else\r
        {\r
@@ -481,7 +492,9 @@ asm jne     expandshort
 //--------------------------\r
 \r
   length--;\r
-\r
+
+       __asm
+       {\r
 asm mov        bx,[headptr]\r
 asm    mov     cl,1\r
 \r
@@ -536,13 +549,16 @@ asm       sub     [WORD PTR ss:length],1
 asm    jnc     expand\r
 asm    dec     [WORD PTR ss:length+2]\r
 asm    jns     expand          // when length = ffff ffff, done\r
-\r
+       }\r
+       }\r
+
+       __asm
+       {\r
+               mov     ax,ss\r
+               mov     ds,ax
        }\r
 \r
-asm    mov     ax,ss\r
-asm    mov     ds,ax\r
-\r
-}\r
+}*/\r
 \r
 \r
 /*\r
@@ -554,7 +570,7 @@ asm mov     ds,ax
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 #define NEARTAG        0xa7\r
 #define FARTAG 0xa8\r
 \r
@@ -615,7 +631,7 @@ void CAL_CarmackExpand (unsigned far *source, unsigned far *dest, unsigned lengt
                }\r
        }\r
 }\r
-\r
+*/\r
 \r
 \r
 /*\r
@@ -625,7 +641,7 @@ void CAL_CarmackExpand (unsigned far *source, unsigned far *dest, unsigned lengt
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,\r
   unsigned rlewtag)\r
 {\r
@@ -672,7 +688,7 @@ long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,
   complength = 2*(dest-start);\r
   return complength;\r
 }\r
-\r
+*/\r
 \r
 /*\r
 ======================\r
@@ -682,7 +698,7 @@ long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,\r
   unsigned rlewtag)\r
 {\r
@@ -790,7 +806,7 @@ asm mov     ax,ss
 asm    mov     ds,ax\r
 \r
 }\r
-\r
+*/\r
 \r
 \r
 /*\r
@@ -809,7 +825,7 @@ asm mov     ds,ax
 ======================\r
 */\r
 \r
-void CAL_SetupGrFile (void)\r
+/*void CAL_SetupGrFile (void)\r
 {\r
        int handle;\r
        memptr compseg;\r
@@ -894,7 +910,7 @@ void CAL_SetupGrFile (void)
        MM_FreePtr(&compseg);\r
 #endif\r
 \r
-}\r
+}*/\r
 \r
 //==========================================================================\r
 \r
@@ -907,7 +923,7 @@ void CAL_SetupGrFile (void)
 ======================\r
 */\r
 \r
-void CAL_SetupMapFile (void)\r
+/*void CAL_SetupMapFile (void)\r
 {\r
        int handle;\r
        long length;\r
@@ -941,7 +957,7 @@ void CAL_SetupMapFile (void)
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit ("Can't open MAPTEMP."EXT"!");\r
 #endif\r
-}\r
+}*/\r
 \r
 //==========================================================================\r
 \r
@@ -954,7 +970,7 @@ void CAL_SetupMapFile (void)
 ======================\r
 */\r
 \r
-void CAL_SetupAudioFile (void)\r
+/*void CAL_SetupAudioFile (void)\r
 {\r
        int handle;\r
        long length;\r
@@ -988,7 +1004,7 @@ void CAL_SetupAudioFile (void)
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit ("Can't open AUDIO."EXT"!");\r
 #endif\r
-}\r
+}*/\r
 \r
 //==========================================================================\r
 \r
@@ -1003,22 +1019,22 @@ void CAL_SetupAudioFile (void)
 ======================\r
 */\r
 \r
-void CA_Startup (void)\r
+void CA_Startup(void)\r
 {\r
 #ifdef PROFILE\r
-       unlink ("PROFILE.TXT");\r
+       unlink("PROFILE.TXT");\r
        profilehandle = open("PROFILE.TXT", O_CREAT | O_WRONLY | O_TEXT);\r
 #endif\r
-\r
+/*++++\r
 // MDM begin - (GAMERS EDGE)\r
 //\r
-       if (!FindFile("AUDIO."EXT,NULL,2))\r
+       if(!FindFile("AUDIO."EXT,NULL,2))\r
                Quit("CA_Startup(): Can't find audio files.");\r
 //\r
 // MDM end\r
 \r
 #ifndef NOAUDIO\r
-       CAL_SetupAudioFile ();\r
+       CAL_SetupAudioFile();\r
 #endif\r
 \r
 // MDM begin - (GAMERS EDGE)\r
@@ -1049,7 +1065,7 @@ void CA_Startup (void)
 \r
        drawcachebox    = CAL_DialogDraw;\r
        updatecachebox  = CAL_DialogUpdate;\r
-       finishcachebox  = CAL_DialogFinish;\r
+       finishcachebox  = CAL_DialogFinish;*/\r
 }\r
 \r
 //==========================================================================\r
@@ -1065,15 +1081,15 @@ void CA_Startup (void)
 ======================\r
 */\r
 \r
-void CA_Shutdown (void)\r
+void CA_Shutdown(void)\r
 {\r
 #ifdef PROFILE\r
-       close (profilehandle);\r
+       close(profilehandle);\r
 #endif\r
-\r
-       close (maphandle);\r
-       close (grhandle);\r
-       close (audiohandle);\r
+/*++++\r
+       close(maphandle);\r
+       close(grhandle);\r
+       close(audiohandle);*/\r
 }\r
 \r
 //===========================================================================\r
@@ -1085,7 +1101,7 @@ void CA_Shutdown (void)
 =\r
 ======================\r
 */\r
-\r
+/*++++
 void CA_CacheAudioChunk (int chunk)\r
 {\r
        long    pos,compressed;\r
@@ -1153,7 +1169,7 @@ done:
        if (compressed>BUFFERSIZE)\r
                MM_FreePtr(&bigbufferseg);\r
 #endif\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -1166,7 +1182,7 @@ done:
 =\r
 ======================\r
 */\r
-\r
+/*++++
 void CA_LoadAllSounds (void)\r
 {\r
        unsigned        start,i;\r
@@ -1205,11 +1221,11 @@ cachein:
                CA_CacheAudioChunk (start);\r
 \r
        oldsoundmode = SoundMode;\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
-#if GRMODE == EGAGR\r
+//++++#if GRMODE == EGAGR\r
 \r
 /*\r
 ======================\r
@@ -1220,7 +1236,7 @@ cachein:
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 unsigned       static  sheight,swidth;\r
 boolean static dothemask;\r
 \r
@@ -1317,7 +1333,7 @@ asm       mov     ds,ax
 }\r
 \r
 #endif\r
-\r
+*/\r
 //===========================================================================\r
 \r
 /*\r
@@ -1329,7 +1345,7 @@ asm       mov     ds,ax
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CAL_CacheSprite (int chunk, byte far *compressed)\r
 {\r
        int i;\r
@@ -1447,7 +1463,7 @@ void CAL_CacheSprite (int chunk, byte far *compressed)
        }\r
 \r
 #endif\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -1461,7 +1477,7 @@ void CAL_CacheSprite (int chunk, byte far *compressed)
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CAL_ExpandGrChunk (int chunk, byte far *source)\r
 {\r
        long    expanded;\r
@@ -1519,7 +1535,7 @@ void CAL_ExpandGrChunk (int chunk, byte far *source)
                CAL_HuffExpand (source,grsegs[chunk],expanded,grhuffman);\r
        }\r
 }\r
-\r
+*/\r
 \r
 /*\r
 ======================\r
@@ -1530,7 +1546,7 @@ void CAL_ExpandGrChunk (int chunk, byte far *source)
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CAL_ReadGrChunk (int chunk)\r
 {\r
        long    pos,compressed;\r
@@ -1574,7 +1590,7 @@ void CAL_ReadGrChunk (int chunk)
        if (compressed>BUFFERSIZE)\r
                MM_FreePtr(&bigbufferseg);\r
 }\r
-\r
+*/\r
 /*\r
 ======================\r
 =\r
@@ -1584,7 +1600,7 @@ void CAL_ReadGrChunk (int chunk)
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CA_CacheGrChunk (int chunk)\r
 {\r
        long    pos,compressed;\r
@@ -1640,7 +1656,7 @@ void CA_CacheGrChunk (int chunk)
        if (compressed>BUFFERSIZE)\r
                MM_FreePtr(&bigbufferseg);\r
 }\r
-\r
+*/\r
 \r
 \r
 //==========================================================================\r
@@ -1652,7 +1668,7 @@ void CA_CacheGrChunk (int chunk)
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CA_CacheMap (int mapnum)\r
 {\r
        long    pos,compressed;\r
@@ -1759,7 +1775,7 @@ void CA_CacheMap (int mapnum)
                if (compressed>BUFFERSIZE)\r
                        MM_FreePtr(&bigbufferseg);\r
        }\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -1773,7 +1789,7 @@ void CA_CacheMap (int mapnum)
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CA_UpLevel (void)\r
 {\r
        if (ca_levelnum==7)\r
@@ -1781,7 +1797,7 @@ void CA_UpLevel (void)
 \r
        ca_levelbit<<=1;\r
        ca_levelnum++;\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -1795,7 +1811,7 @@ void CA_UpLevel (void)
 =\r
 ======================\r
 */\r
-\r
+/*++\r
 void CA_DownLevel (void)\r
 {\r
        if (!ca_levelnum)\r
@@ -1803,7 +1819,7 @@ void CA_DownLevel (void)
        ca_levelbit>>=1;\r
        ca_levelnum--;\r
        CA_CacheMarks(NULL);\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -1816,7 +1832,7 @@ void CA_DownLevel (void)
 =\r
 ======================\r
 */\r
-\r
+/*\r
 void CA_ClearMarks (void)\r
 {\r
        int i;\r
@@ -1824,7 +1840,7 @@ void CA_ClearMarks (void)
        for (i=0;i<NUMCHUNKS;i++)\r
                grneeded[i]&=~ca_levelbit;\r
 }\r
-\r
+*/\r
 \r
 //===========================================================================\r
 \r
@@ -1837,14 +1853,14 @@ void CA_ClearMarks (void)
 =\r
 ======================\r
 */\r
-\r
+/*\r
 void CA_ClearAllMarks (void)\r
 {\r
        _fmemset (grneeded,0,sizeof(grneeded));\r
        ca_levelbit = 1;\r
        ca_levelnum = 0;\r
 }\r
-\r
+*/\r
 \r
 //===========================================================================\r
 \r
@@ -1855,7 +1871,7 @@ void CA_ClearAllMarks (void)
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CA_FreeGraphics (void)\r
 {\r
        int     i;\r
@@ -1864,7 +1880,7 @@ void CA_FreeGraphics (void)
                if (grsegs[i])\r
                        MM_SetPurge (&(memptr)grsegs[i],3);\r
 }\r
-\r
+*/\r
 \r
 /*\r
 ======================\r
@@ -1875,7 +1891,7 @@ void CA_FreeGraphics (void)
 =\r
 ======================\r
 */\r
-\r
+/*++++++++\r
 void CA_SetAllPurge (void)\r
 {\r
        int i;\r
@@ -1922,7 +1938,7 @@ void CA_SetGrPurge (void)
        for (i=0;i<NUMCHUNKS;i++)\r
                if (grsegs[i])\r
                        MM_SetPurge (&(memptr)grsegs[i],3);\r
-}\r
+}*/\r
 \r
 \r
 //===========================================================================\r
@@ -1935,7 +1951,7 @@ void CA_SetGrPurge (void)
 =\r
 ======================\r
 */\r
-\r
+/*\r
 #define NUMBARS        (17l*8)\r
 #define BARSTEP        8\r
 \r
@@ -1985,7 +2001,7 @@ void      CAL_DialogDraw (char *title,unsigned numcache)
 \r
        VW_UpdateScreen();\r
 }\r
-\r
+*/\r
 \r
 /*\r
 ======================\r
@@ -1994,7 +2010,7 @@ void      CAL_DialogDraw (char *title,unsigned numcache)
 =\r
 ======================\r
 */\r
-\r
+/*\r
 void   CAL_DialogUpdate (void)\r
 {\r
        unsigned        x,xh;\r
@@ -2013,7 +2029,7 @@ void      CAL_DialogUpdate (void)
                lastx = xh;\r
                VW_UpdateScreen();\r
        }\r
-}\r
+}*/\r
 \r
 /*\r
 ======================\r
@@ -2022,7 +2038,7 @@ void      CAL_DialogUpdate (void)
 =\r
 ======================\r
 */\r
-\r
+/*\r
 void   CAL_DialogFinish (void)\r
 {\r
        unsigned        x,xh;\r
@@ -2037,7 +2053,7 @@ void      CAL_DialogFinish (void)
 #endif\r
        VW_UpdateScreen();\r
 \r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -2047,7 +2063,7 @@ void      CAL_DialogFinish (void)
 = CA_CacheMarks\r
 =\r
 ======================\r
-*/\r
+*//*\r
 #define MAXEMPTYREAD   1024\r
 \r
 void CA_CacheMarks (char *title)\r
@@ -2188,4 +2204,4 @@ void CA_CacheMarks (char *title)
 //\r
                if (dialog && finishcachebox)\r
                        finishcachebox();\r
-}\r
+}*/\r

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index c4ab670..49a3e91 100644 (file)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -17,13 +17,17 @@
  */\r
 \r
 // ID_CA.H\r
-\r
-#ifndef __ID_MM__\r
-#include "ID_MM.H"\r
+#ifndef __16_CA__\r
+#define __16_CA__
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef __16_MM__
+#include "src/lib/16_head.h"
+#include "src/lib/16_mm.h"\r
 #endif\r
 \r
-#define __ID_CA__\r
-\r
 //===========================================================================\r
 \r
 //#define NOMAPS\r
@@ -81,14 +85,14 @@ extern      void    (*finishcachebox)       (void);
 \r
 void CA_OpenDebug (void);\r
 void CA_CloseDebug (void);\r
-boolean CA_FarRead (int handle, byte far *dest, long length);\r
-boolean CA_FarWrite (int handle, byte far *source, long length);\r
+boolean CA_FarRead (int handle, byte far *dest, dword length);\r
+boolean CA_FarWrite (int handle, byte far *source, dword length);\r
 boolean CA_ReadFile (char *filename, memptr *ptr);\r
 boolean CA_LoadFile (char *filename, memptr *ptr);\r
 \r
-long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);\r
+//long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);\r
 \r
-void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag);\r
+//void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag);\r
 \r
 void CA_Startup (void);\r
 void CA_Shutdown (void);\r
@@ -110,4 +114,4 @@ void CA_CacheGrChunk (int chunk);
 void CA_CacheMap (int mapnum);\r
 \r
 void CA_CacheMarks (char *title);*/\r
-\r
+#endif\r