16_ca needs huge amounts of work and I should remember what needs to be done soon...

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

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
old mode 100644 (file)
new mode 100755 (executable)
index c4ab670..db9cba5
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -17,29 +17,39 @@
  */\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
-//#define NOGRAPHICS\r
-//#define NOAUDIO\r
+/*moved to src/lib/16_tdef.h\r
+#define NOMAPS\r
+#define NOGRAPHICS\r
+#define NOAUDIO\r
 \r
-//#define MAPHEADERLINKED\r
+#define MAPHEADERLINKED\r
 //#define GRHEADERLINKED\r
-//#define AUDIOHEADERLINKED\r
+#define AUDIOHEADERLINKED\r
 \r
-//#define NUMMAPS              39\r
-//#define MAPPLANES            3\r
+#define NUMMAPS                39\r
+#define MAPPLANES              3*/\r
+//++++#define PROFILE//++++\r
 \r
 //===========================================================================\r
 \r
-/*typedef      struct\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
        unsigned        planelength[3];\r
@@ -60,9 +70,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\r
 \r
 //\r
 // hooks for custom cache dialogs\r
@@ -79,35 +89,38 @@ extern      void    (*finishcachebox)       (void);
 \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_OpenDebug (global_game_variables_t *gvar);\r
+void CA_CloseDebug (global_game_variables_t *gvar);\r
+boolean CA_FarRead (int handle, byte far *dest, dword length, global_game_variables_t *gvar);\r
+boolean CA_FarWrite (int handle, byte far *source, dword length, global_game_variables_t *gvar);\r
 \r
-long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);\r
+boolean CA_ReadFile (char *filename, memptr *ptr, global_game_variables_t *gvar);\r
+boolean CA_WriteFile (char *filename, void far *ptr, long length, global_game_variables_t *gvar);\r
+boolean CA_LoadFile (char *filename, memptr *ptr, global_game_variables_t *gvar);\r
 \r
-void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag);\r
+long CA_RLEWCompress (unsigned far *source, long length, unsigned far *dest,unsigned rlewtag);\r
 \r
-void CA_Startup (void);\r
-void CA_Shutdown (void);\r
+void CA_RLEWexpand (unsigned far *source, unsigned far *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
 \r
 //void CA_CacheAudioChunk (int chunk);\r
 //void CA_LoadAllSounds (void);\r
 \r
 /*void CA_UpLevel (void);\r
-void CA_DownLevel (void);\r
+void CA_DownLevel (void);*/\r
 \r
-void CA_SetAllPurge (void);\r
+void CA_SetGrPurge (global_game_variables_t *gvar);\r
+void CA_SetAllPurge (global_game_variables_t *gvar);\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
 \r
 void CA_CacheMarks (char *title);*/\r
-\r
+#endif\r