bloody typedefstruct merging is going to be tricky

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

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index a5c016d27e69a7b3741f716dc76525dd74944a2a..41649dbfd8a244095e76903347435fb4906f6ca1 100755 (executable)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -37,10 +37,17 @@
 \r
 //#define NUMMAPS              39\r
 //#define MAPPLANES            3\r
-#define PROFILE\r
+//++++#define PROFILE//++++\r
 \r
 //===========================================================================\r
 \r
+/*typedef struct\r
+{\r
+       unsigned        RLEWtag;\r
+       long            headeroffsets[100];\r
+       byte            tileinfo[];\r
+} mapfiletype;*/\r
+\r
 /*typedef      struct\r
 {\r
        long            planestart[3];\r
@@ -90,9 +97,9 @@ boolean CA_ReadFile (char *filename, memptr *ptr, mminfo_t *mm);
 boolean CA_WriteFile (char *filename, void far *ptr, long length, mminfo_t *mm);\r
 boolean CA_LoadFile (char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi);\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 (global_game_variables_t *gvar);\r
 void CA_Shutdown (global_game_variables_t *gvar);\r
@@ -104,12 +111,12 @@ void CA_Shutdown (global_game_variables_t *gvar);
 void CA_DownLevel (void);\r
 \r
 void CA_SetGrPurge (void);\r
-void CA_SetAllPurge (void);\r
+void CA_SetAllPurge (void);*/\r
 \r
-void CA_ClearMarks (void);\r
-void CA_ClearAllMarks (void);\r
+void CA_ClearMarks (global_game_variables_t *gvar);\r
+void CA_ClearAllMarks (global_game_variables_t *gvar);\r
 \r
-#define CA_MarkGrChunk(chunk)  grneeded[chunk]|=ca_levelbit\r
+/*#define CA_MarkGrChunk(chunk)        grneeded[chunk]|=ca_levelbit\r
 \r
 void CA_CacheGrChunk (int chunk);\r
 void CA_CacheMap (int mapnum);\r