X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_ca.h;h=471a4517de1b5e5f2b04a5bb83b479b74f630ab5;hb=d26e0714368d1cfbe4caee5d6309cf97e0af55db;hp=c4ab670524c092cc8379011a093c0b99340a7e39;hpb=61da0962e85739dc05c35eddb279d400ebbb455f;p=16.git

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
old mode 100644
new mode 100755
index c4ab6705..471a4517
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -17,13 +17,14 @@
  */
 
 // ID_CA.H
+#ifndef __16_CA__
+#define __16_CA__
 
-#ifndef __ID_MM__
-#include "ID_MM.H"
+#ifndef __16_MM__
+#include "src/lib/16_head.h"
+#include "src/lib/16_mm.h"
 #endif
 
-#define __ID_CA__
-
 //===========================================================================
 
 //#define NOMAPS
@@ -36,9 +37,17 @@
 
 //#define NUMMAPS		39
 //#define MAPPLANES		3
+//++++#define PROFILE//++++
 
 //===========================================================================
 
+/*typedef struct
+{
+	unsigned	RLEWtag;
+	long		headeroffsets[100];
+	byte		tileinfo[];
+} mapfiletype;*/
+
 /*typedef	struct
 {
 	long		planestart[3];
@@ -60,9 +69,9 @@ extern	void		_seg	*grsegs[NUMCHUNKS];
 extern	byte		far	grneeded[NUMCHUNKS];
 extern	byte		ca_levelbit,ca_levelnum;
 
-extern	char		*titleptr[8];
+extern	char		*titleptr[8];*/
 
-extern	int			profilehandle,debughandle;*/
+//extern
 
 //
 // hooks for custom cache dialogs
@@ -79,19 +88,21 @@ extern	void	(*finishcachebox)	(void);
 
 //===========================================================================
 
-void CA_OpenDebug (void);
-void CA_CloseDebug (void);
-boolean CA_FarRead (int handle, byte far *dest, long length);
-boolean CA_FarWrite (int handle, byte far *source, long length);
-boolean CA_ReadFile (char *filename, memptr *ptr);
-boolean CA_LoadFile (char *filename, memptr *ptr);
+void CA_OpenDebug (global_game_variables_t *gvar);
+void CA_CloseDebug (global_game_variables_t *gvar);
+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);
 
-long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);
+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);
 
-void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag);
+long CA_RLEWCompress (unsigned far *source, long length, unsigned far *dest,unsigned rlewtag);
 
-void CA_Startup (void);
-void CA_Shutdown (void);
+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);
 
 //void CA_CacheAudioChunk (int chunk);
 //void CA_LoadAllSounds (void);
@@ -99,15 +110,16 @@ void CA_Shutdown (void);
 /*void CA_UpLevel (void);
 void CA_DownLevel (void);
 
-void CA_SetAllPurge (void);
+void CA_SetGrPurge (void);
+void CA_SetAllPurge (void);*/
 
-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);
 
 void CA_CacheMarks (char *title);*/
-
+#endif