X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_ca.h;h=d0984fd6bb43f31c464132d089b4dc072633ec7a;hb=848c772e64209441c696de3d8101f7b3b81f1354;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..d0984fd6
--- 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,6 +37,7 @@
 
 //#define NUMMAPS		39
 //#define MAPPLANES		3
+#define PROFILE
 
 //===========================================================================
 
@@ -60,9 +62,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 +81,20 @@ 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 huge *dest, dword length, mminfo_t *mm);
+boolean CA_FarWrite (int handle, byte huge *source, dword length, mminfo_t *mm);
+
+boolean CA_ReadFile (char *filename, memptr *ptr, mminfo_t *mm);
+boolean CA_LoadFile (char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi);
 
-long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);
+//long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag);
 
-void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag);
+//void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag);
 
-void CA_Startup (void);
-void CA_Shutdown (void);
+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);
@@ -110,4 +113,4 @@ void CA_CacheGrChunk (int chunk);
 void CA_CacheMap (int mapnum);
 
 void CA_CacheMarks (char *title);*/
-
+#endif