modified the thing a bit!

[16.git] / src / lib / 16_ca.c

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 29df8f63d634516031dd1f9e672a7fe43912f415..fc40735329ff3c65701d0b70139f9a5c5b3562f0 100644 (file)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -30,7 +30,7 @@ loaded into the data segment
 =============================================================================\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
@@ -74,9 +74,9 @@ byte          _seg    *audiosegs[NUMSNDCHUNKS];
 void           _seg    *grsegs[NUMCHUNKS];\r
 \r
 byte           far     grneeded[NUMCHUNKS];\r
-byte           ca_levelbit,ca_levelnum;\r
+byte           ca_levelbit,ca_levelnum;*/\r
 \r
-int                    profilehandle,debughandle;*/\r
+int                    profilehandle,debughandle;\r
 \r
 void   (*drawcachebox)         (char *title, unsigned numcache);\r
 void   (*updatecachebox)       (void);\r
@@ -90,7 +90,7 @@ void  (*finishcachebox)       (void);
 =============================================================================\r
 */\r
 \r
-extern long    far     CGAhead;\r
+/*extern       long    far     CGAhead;\r
 extern long    far     EGAhead;\r
 extern byte    CGAdict;\r
 extern byte    EGAdict;\r
@@ -128,12 +128,11 @@ SDMode            oldsoundmode;
 \r
 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_DialogFinish (void);*/\r
+//void CAL_CarmackExpand (unsigned far *source, unsigned far *dest,unsigned length);\r
 \r
 \r
-#ifdef THREEBYTEGRSTARTS\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
@@ -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,16 +173,15 @@ long GRFILEPOS(int c)
 =\r
 ============================\r
 */\r
-\r
-void CA_OpenDebug (void)\r
+void CA_OpenDebug(void)\r
 {\r
-       unlink ("DEBUG.TXT");\r
-       debughandle = open("DEBUG.TXT", O_CREAT | O_WRONLY | O_TEXT);\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
+       close(debughandle);\r
 }\r
 \r
 \r
@@ -198,13 +196,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,29 +215,49 @@ 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 huge *dest, dword length, mminfo_t *mm)\r
 {\r
-       if (length>0xffffl)\r
-               printf("CA_FarRead doesn't support 64K reads yet!\n");\r
-\r
-asm            push    ds\r
-asm            mov     bx,[handle]\r
-asm            mov     cx,[WORD PTR length]\r
-asm            mov     dx,[WORD PTR dest]\r
-asm            mov     ds,[WORD PTR dest+2]\r
-asm            mov     ah,0x3f                         // READ w/handle\r
-asm            int     21h\r
-asm            pop     ds\r
-asm            jnc     good\r
-       errno = _AX;\r
-       return  false;\r
+       boolean flag;\r
+       dword fat=0;
+       word segm=0;
+       //if(mm->EMSVer<0x40)\r
+       if(length>0xfffflu)
+       {
+               printf("File is a fat bakapee\n");
+               segm=(length%0xfffflu)-1;
+               fat=segm*0xfffflu;
+               length-=fat;\r
+//             printf("CA_FarRead doesn't support 64K reads yet!\n");\r
+       }
+
+       if(!fat&&!segm)
+       {\r
+               __asm\r
+               {\r
+                       push    ds\r
+                       mov     bx,[handle]\r
+                       mov     cx,[WORD PTR length]\r
+                       mov     dx,[WORD PTR dest]\r
+                       mov     ds,[WORD PTR dest+2]\r
+                       mov     ah,0x3f                         // READ w/handle\r
+                       int     21h\r
+                       pop     ds\r
+                       jnc     good\r
+                       mov     errno,ax\r
+                       mov     flag,0\r
+                       jmp End\r
 good:\r
-asm            cmp     ax,[WORD PTR length]\r
-asm            je      done\r
-       errno = EINVFMT;                        // user manager knows this is bad read\r
-       return  false;\r
+                       cmp     ax,[WORD PTR length]\r
+                       je      done\r
+//                     errno = EINVFMT;                        // user manager knows this is bad read\r
+                       mov     flag,0\r
+                       jmp End\r
 done:\r
-       return  true;\r
+                       mov     flag,1\r
+End:\r
+               }\r
+       return flag;
+       }else return 0;//todo: EXPAND!!!\r
 }\r
 \r
 \r
@@ -253,30 +271,49 @@ done:
 ==========================\r
 */\r
 \r
-boolean CA_FarWrite (int handle, byte far *source, long length)\r
+boolean CA_FarWrite(int handle, byte huge *source, dword length, mminfo_t *mm)\r
 {\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
+       boolean flag;\r
+       dword fat=0;
+       word segm=0;
+       //if(mm->EMSVer<0x40)\r
+       if(length>0xfffflu)
+       {
+               printf("File is a fat bakapee\n");
+               segm=(length%0xfffflu)-1;
+               fat=segm*0xfffflu;
+               length-=fat;\r
+//             printf("CA_FarRead doesn't support 64K reads yet!\n");\r
+       }\r
+
+       if(!fat&&!segm)
+       {\r
+               __asm\r
+               {\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\r
+                       mov     errno,ax\r
+                       mov flag,0\r
+                       jmp End\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
-\r
+                       cmp     ax,[WORD PTR length]\r
+                       je      done\r
+                       //errno = ENOMEM;                               // user manager knows this is bad write\r
+                       mov     flag,0\r
+                       jmp End\r
 done:\r
-       return  true;\r
+                       mov     flag,1\r
+End:\r
+               }\r
+       return flag;
+       }else return 0;\r
 }\r
 \r
 \r
@@ -290,21 +327,21 @@ done:
 ==========================\r
 */\r
 \r
-boolean CA_ReadFile (char *filename, memptr *ptr)\r
+boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)\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, mm))\r
        {\r
-               close (handle);\r
+               close(handle);\r
                return false;\r
        }\r
-       close (handle);\r
+       close(handle);\r
        return true;\r
 }\r
 \r
@@ -320,22 +357,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, mminfo_t *mm, mminfotype *mmi)\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
+       MM_GetPtr(ptr,size, mm, mmi);\r
+       if(!CA_FarRead(handle,*ptr,size, mm))\r
        {\r
-               close (handle);\r
+               close(handle);\r
                return false;\r
        }\r
-       close (handle);\r
+       close(handle);\r
        return true;\r
 }\r
 \r
@@ -389,7 +426,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
@@ -423,25 +460,27 @@ void CAL_HuffExpand (byte huge *source, byte huge *dest,
 // expand less than 64k of data\r
 //--------------------------\r
 \r
-asm mov        bx,[headptr]\r
+       __asm\r
+       {\r
+               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
@@ -466,6 +505,7 @@ asm mov     bx,[headptr]            // back to the head node for next bit
 \r
 asm    cmp     di,ax                           // done?\r
 asm    jne     expandshort\r
+       }\r
        }\r
        else\r
        {\r
@@ -476,6 +516,8 @@ asm jne     expandshort
 \r
   length--;\r
 \r
+       __asm\r
+       {\r
 asm mov        bx,[headptr]\r
 asm    mov     cl,1\r
 \r
@@ -530,13 +572,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
 \r
-asm    mov     ax,ss\r
-asm    mov     ds,ax\r
+       __asm\r
+       {\r
+               mov     ax,ss\r
+               mov     ds,ax\r
+       }\r
 \r
-}\r
+}*/\r
 \r
 \r
 /*\r
@@ -548,7 +593,7 @@ asm mov     ds,ax
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 #define NEARTAG        0xa7\r
 #define FARTAG 0xa8\r
 \r
@@ -609,7 +654,7 @@ void CAL_CarmackExpand (unsigned far *source, unsigned far *dest, unsigned lengt
                }\r
        }\r
 }\r
-\r
+*/\r
 \r
 \r
 /*\r
@@ -619,7 +664,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
@@ -666,7 +711,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
@@ -676,7 +721,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
@@ -784,7 +829,7 @@ asm mov     ax,ss
 asm    mov     ds,ax\r
 \r
 }\r
-\r
+*/\r
 \r
 \r
 /*\r
@@ -803,7 +848,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
@@ -888,7 +933,7 @@ void CAL_SetupGrFile (void)
        MM_FreePtr(&compseg);\r
 #endif\r
 \r
-}\r
+}*/\r
 \r
 //==========================================================================\r
 \r
@@ -901,7 +946,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
@@ -935,7 +980,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
@@ -948,7 +993,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
@@ -982,7 +1027,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
@@ -997,22 +1042,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
@@ -1043,7 +1088,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
@@ -1059,15 +1104,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
@@ -1079,7 +1124,7 @@ void CA_Shutdown (void)
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CA_CacheAudioChunk (int chunk)\r
 {\r
        long    pos,compressed;\r
@@ -1147,7 +1192,7 @@ done:
        if (compressed>BUFFERSIZE)\r
                MM_FreePtr(&bigbufferseg);\r
 #endif\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -1160,7 +1205,7 @@ done:
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CA_LoadAllSounds (void)\r
 {\r
        unsigned        start,i;\r
@@ -1199,11 +1244,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
@@ -1214,7 +1259,7 @@ cachein:
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 unsigned       static  sheight,swidth;\r
 boolean static dothemask;\r
 \r
@@ -1311,7 +1356,7 @@ asm       mov     ds,ax
 }\r
 \r
 #endif\r
-\r
+*/\r
 //===========================================================================\r
 \r
 /*\r
@@ -1323,7 +1368,7 @@ asm       mov     ds,ax
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CAL_CacheSprite (int chunk, byte far *compressed)\r
 {\r
        int i;\r
@@ -1441,7 +1486,7 @@ void CAL_CacheSprite (int chunk, byte far *compressed)
        }\r
 \r
 #endif\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -1455,7 +1500,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
@@ -1513,7 +1558,7 @@ void CAL_ExpandGrChunk (int chunk, byte far *source)
                CAL_HuffExpand (source,grsegs[chunk],expanded,grhuffman);\r
        }\r
 }\r
-\r
+*/\r
 \r
 /*\r
 ======================\r
@@ -1524,7 +1569,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
@@ -1568,7 +1613,7 @@ void CAL_ReadGrChunk (int chunk)
        if (compressed>BUFFERSIZE)\r
                MM_FreePtr(&bigbufferseg);\r
 }\r
-\r
+*/\r
 /*\r
 ======================\r
 =\r
@@ -1578,7 +1623,7 @@ void CAL_ReadGrChunk (int chunk)
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CA_CacheGrChunk (int chunk)\r
 {\r
        long    pos,compressed;\r
@@ -1634,7 +1679,7 @@ void CA_CacheGrChunk (int chunk)
        if (compressed>BUFFERSIZE)\r
                MM_FreePtr(&bigbufferseg);\r
 }\r
-\r
+*/\r
 \r
 \r
 //==========================================================================\r
@@ -1646,7 +1691,7 @@ void CA_CacheGrChunk (int chunk)
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CA_CacheMap (int mapnum)\r
 {\r
        long    pos,compressed;\r
@@ -1753,7 +1798,7 @@ void CA_CacheMap (int mapnum)
                if (compressed>BUFFERSIZE)\r
                        MM_FreePtr(&bigbufferseg);\r
        }\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -1767,7 +1812,7 @@ void CA_CacheMap (int mapnum)
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CA_UpLevel (void)\r
 {\r
        if (ca_levelnum==7)\r
@@ -1775,7 +1820,7 @@ void CA_UpLevel (void)
 \r
        ca_levelbit<<=1;\r
        ca_levelnum++;\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -1789,7 +1834,7 @@ void CA_UpLevel (void)
 =\r
 ======================\r
 */\r
-\r
+/*++\r
 void CA_DownLevel (void)\r
 {\r
        if (!ca_levelnum)\r
@@ -1797,7 +1842,7 @@ void CA_DownLevel (void)
        ca_levelbit>>=1;\r
        ca_levelnum--;\r
        CA_CacheMarks(NULL);\r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -1810,7 +1855,7 @@ void CA_DownLevel (void)
 =\r
 ======================\r
 */\r
-\r
+/*\r
 void CA_ClearMarks (void)\r
 {\r
        int i;\r
@@ -1818,7 +1863,7 @@ void CA_ClearMarks (void)
        for (i=0;i<NUMCHUNKS;i++)\r
                grneeded[i]&=~ca_levelbit;\r
 }\r
-\r
+*/\r
 \r
 //===========================================================================\r
 \r
@@ -1831,14 +1876,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
@@ -1849,7 +1894,7 @@ void CA_ClearAllMarks (void)
 =\r
 ======================\r
 */\r
-\r
+/*++++\r
 void CA_FreeGraphics (void)\r
 {\r
        int     i;\r
@@ -1858,7 +1903,7 @@ void CA_FreeGraphics (void)
                if (grsegs[i])\r
                        MM_SetPurge (&(memptr)grsegs[i],3);\r
 }\r
-\r
+*/\r
 \r
 /*\r
 ======================\r
@@ -1869,7 +1914,7 @@ void CA_FreeGraphics (void)
 =\r
 ======================\r
 */\r
-\r
+/*++++++++\r
 void CA_SetAllPurge (void)\r
 {\r
        int i;\r
@@ -1916,7 +1961,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
@@ -1929,7 +1974,7 @@ void CA_SetGrPurge (void)
 =\r
 ======================\r
 */\r
-\r
+/*\r
 #define NUMBARS        (17l*8)\r
 #define BARSTEP        8\r
 \r
@@ -1979,7 +2024,7 @@ void      CAL_DialogDraw (char *title,unsigned numcache)
 \r
        VW_UpdateScreen();\r
 }\r
-\r
+*/\r
 \r
 /*\r
 ======================\r
@@ -1988,7 +2033,7 @@ void      CAL_DialogDraw (char *title,unsigned numcache)
 =\r
 ======================\r
 */\r
-\r
+/*\r
 void   CAL_DialogUpdate (void)\r
 {\r
        unsigned        x,xh;\r
@@ -2007,7 +2052,7 @@ void      CAL_DialogUpdate (void)
                lastx = xh;\r
                VW_UpdateScreen();\r
        }\r
-}\r
+}*/\r
 \r
 /*\r
 ======================\r
@@ -2016,7 +2061,7 @@ void      CAL_DialogUpdate (void)
 =\r
 ======================\r
 */\r
-\r
+/*\r
 void   CAL_DialogFinish (void)\r
 {\r
        unsigned        x,xh;\r
@@ -2031,7 +2076,7 @@ void      CAL_DialogFinish (void)
 #endif\r
        VW_UpdateScreen();\r
 \r
-}\r
+}*/\r
 \r
 //===========================================================================\r
 \r
@@ -2041,7 +2086,7 @@ void      CAL_DialogFinish (void)
 = CA_CacheMarks\r
 =\r
 ======================\r
-*/\r
+*//*\r
 #define MAXEMPTYREAD   1024\r
 \r
 void CA_CacheMarks (char *title)\r
@@ -2182,4 +2227,4 @@ void CA_CacheMarks (char *title)
 //\r
                if (dialog && finishcachebox)\r
                        finishcachebox();\r
-}\r
+}*/\r