X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_ca.h;h=db9cba58101e41249eabf3318683c00c7cb217bb;hb=256be2f6f35912701d3e3770e49e388f462a6acc;hp=a5c016d27e69a7b3741f716dc76525dd74944a2a;hpb=309a997554bc5d4df02621da8b92996270ed1ac2;p=16.git

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index a5c016d2..db9cba58 100755
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -27,21 +27,29 @@
 
 //===========================================================================
 
-//#define NOMAPS
-//#define NOGRAPHICS
-//#define NOAUDIO
+/*moved to src/lib/16_tdef.h
+#define NOMAPS
+#define NOGRAPHICS
+#define NOAUDIO
 
-//#define MAPHEADERLINKED
+#define MAPHEADERLINKED
 //#define GRHEADERLINKED
-//#define AUDIOHEADERLINKED
+#define AUDIOHEADERLINKED
 
-//#define NUMMAPS		39
-//#define MAPPLANES		3
-#define PROFILE
+#define NUMMAPS		39
+#define MAPPLANES		3*/
+//++++#define PROFILE//++++
 
 //===========================================================================
 
-/*typedef	struct
+/*typedef struct
+{
+	unsigned	RLEWtag;
+	long		headeroffsets[100];
+	byte		tileinfo[];
+} mapfiletype;
+
+typedef	struct
 {
 	long		planestart[3];
 	unsigned	planelength[3];
@@ -83,16 +91,16 @@ extern	void	(*finishcachebox)	(void);
 
 void CA_OpenDebug (global_game_variables_t *gvar);
 void CA_CloseDebug (global_game_variables_t *gvar);
-boolean CA_FarRead (int handle, byte huge *dest, dword length, mminfo_t *mm);
-boolean CA_FarWrite (int handle, byte huge *source, dword length, mminfo_t *mm);
+boolean CA_FarRead (int handle, byte far *dest, dword length, global_game_variables_t *gvar);
+boolean CA_FarWrite (int handle, byte far *source, dword length, global_game_variables_t *gvar);
 
-boolean CA_ReadFile (char *filename, memptr *ptr, mminfo_t *mm);
-boolean CA_WriteFile (char *filename, void far *ptr, long length, mminfo_t *mm);
-boolean CA_LoadFile (char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi);
+boolean CA_ReadFile (char *filename, memptr *ptr, global_game_variables_t *gvar);
+boolean CA_WriteFile (char *filename, void far *ptr, long length, global_game_variables_t *gvar);
+boolean CA_LoadFile (char *filename, memptr *ptr, global_game_variables_t *gvar);
 
-//long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);
+long CA_RLEWCompress (unsigned far *source, long length, unsigned far *dest,unsigned rlewtag);
 
-//void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag);
+void CA_RLEWexpand (unsigned far *source, unsigned far *dest,long length,unsigned rlewtag);
 
 void CA_Startup (global_game_variables_t *gvar);
 void CA_Shutdown (global_game_variables_t *gvar);
@@ -101,15 +109,15 @@ void CA_Shutdown (global_game_variables_t *gvar);
 //void CA_LoadAllSounds (void);
 
 /*void CA_UpLevel (void);
-void CA_DownLevel (void);
+void CA_DownLevel (void);*/
 
-void CA_SetGrPurge (void);
-void CA_SetAllPurge (void);
+void CA_SetGrPurge (global_game_variables_t *gvar);
+void CA_SetAllPurge (global_game_variables_t *gvar);
 
-void CA_ClearMarks (void);
-void CA_ClearAllMarks (void);
+void CA_ClearMarks (global_game_variables_t *gvar);
+void CA_ClearAllMarks (global_game_variables_t *gvar);
 
-#define CA_MarkGrChunk(chunk)	grneeded[chunk]|=ca_levelbit
+/*#define CA_MarkGrChunk(chunk)	grneeded[chunk]|=ca_levelbit
 
 void CA_CacheGrChunk (int chunk);
 void CA_CacheMap (int mapnum);