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
index 54a125ae0da512c74417a8f53a2d192b52fe81bb..db9cba58101e41249eabf3318683c00c7cb217bb 100755 (executable)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -27,21 +27,29 @@
 \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
@@ -83,16 +91,16 @@ extern      void    (*finishcachebox)       (void);
 \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 huge *dest, dword length, mminfo_t *mm);\r
-boolean CA_FarWrite (int handle, byte huge *source, dword length, mminfo_t *mm);\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
-boolean CA_ReadFile (char *filename, memptr *ptr, mminfo_t *mm);\r
-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
+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
-//long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);\r
+long CA_RLEWCompress (unsigned far *source, long length, unsigned far *dest,unsigned rlewtag);\r
 \r
-//void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag);\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
@@ -101,10 +109,10 @@ void CA_Shutdown (global_game_variables_t *gvar);
 //void CA_LoadAllSounds (void);\r
 \r
 /*void CA_UpLevel (void);\r
-void CA_DownLevel (void);\r
+void CA_DownLevel (void);*/\r
 \r
-void CA_SetGrPurge (void);\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 (global_game_variables_t *gvar);\r
 void CA_ClearAllMarks (global_game_variables_t *gvar);\r