new files ^^

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

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index c4ab670524c092cc8379011a093c0b99340a7e39..29030c6a7ca7d796f5c792e4d60d5d33396d7cfa 100644 (file)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -17,13 +17,14 @@
  */\r
 \r
 // ID_CA.H\r
+#ifndef __16_CA__\r
+#define __16_CA__\r
 \r
-#ifndef __ID_MM__\r
-#include "ID_MM.H"\r
+#ifndef __16_MM__\r
+#include "src/lib/16_head.h"\r
+#include "src/lib/16_mm.h"\r
 #endif\r
 \r
-#define __ID_CA__\r
-\r
 //===========================================================================\r
 \r
 //#define NOMAPS\r
@@ -60,9 +61,9 @@ extern        void            _seg    *grsegs[NUMCHUNKS];
 extern byte            far     grneeded[NUMCHUNKS];\r
 extern byte            ca_levelbit,ca_levelnum;\r
 \r
-extern char            *titleptr[8];\r
+extern char            *titleptr[8];*/\r
 \r
-extern int                     profilehandle,debughandle;*/\r
+extern int                     profilehandle,debughandle;\r
 \r
 //\r
 // hooks for custom cache dialogs\r
@@ -78,17 +79,18 @@ extern      void    (*finishcachebox)       (void);
 //void CAL_ShiftSprite (unsigned segment,unsigned source,unsigned dest,unsigned width, unsigned height, unsigned pixshift, boolean domask);\r
 \r
 //===========================================================================\r
-\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_ReadFile (char *filename, memptr *ptr);\r
-boolean CA_LoadFile (char *filename, memptr *ptr);\r
+void CA_CloseDebug (void);
+boolean CA_FarRead (int handle, byte huge *dest, dword length, mminfo_t *mm);\r
+boolean CA_FarWrite (int handle, byte huge *source, dword length, mminfo_t *mm);
+\r
+boolean CA_ReadFile (char *filename, memptr *ptr, mminfo_t *mm);\r
+boolean CA_LoadFile (char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi);
 \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 +112,4 @@ void CA_CacheGrChunk (int chunk);
 void CA_CacheMap (int mapnum);\r
 \r
 void CA_CacheMarks (char *title);*/\r
-\r
+#endif\r