X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_ca.h;h=b752bae52eb8d782bc8c403de284fad56f14e15b;hb=cfa61df0152c0dff3c78b9ef35f8b82bdf7506e1;hp=380ae2976af9a98e094399dbfa6022510a8359e8;hpb=c4ea89ef8cb104fb6f9f9edd4f4bf55e7984a51f;p=16.git

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index 380ae297..b752bae5 100644
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -17,47 +17,44 @@
  */
 
 // ID_CA.H
+#ifndef __16_CA__
+#define __16_CA__
 
-#ifndef __TYPES__
-#include "ID_TYPES.H"
-#endif
-
-#ifndef __ID_MM__
-#include "ID_MM.H"
-#endif
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
 
-#ifndef __ID_GLOB__
-#include "ID_GLOB.H"
+#ifndef __16_MM__
+#include "src/lib/16_head.h"
+#include "src/lib/16_mm.h"
 #endif
 
-#define __ID_CA__
-
 //===========================================================================
 
 //#define NOMAPS
 //#define NOGRAPHICS
 //#define NOAUDIO
 
-#define MAPHEADERLINKED
-#define GRHEADERLINKED
-#define AUDIOHEADERLINKED
+//#define MAPHEADERLINKED
+//#define GRHEADERLINKED
+//#define AUDIOHEADERLINKED
 
-#define NUMMAPS		39
-#define MAPPLANES		3
+//#define NUMMAPS		39
+//#define MAPPLANES		3
 
 //===========================================================================
 
-typedef	struct
+/*typedef	struct
 {
 	long		planestart[3];
 	unsigned	planelength[3];
 	unsigned	width,height;
 	char		name[16];
-} maptype;
+} maptype;*/
 
 //===========================================================================
 
-extern	byte 		_seg	*tinf;
+/*extern	byte 		_seg	*tinf;
 extern	int			mapon;
 
 extern	unsigned	_seg	*mapsegs[3];
@@ -70,7 +67,7 @@ extern	byte		ca_levelbit,ca_levelnum;
 
 extern	char		*titleptr[8];
 
-extern	int			profilehandle,debughandle;
+extern	int			profilehandle,debughandle;*/
 
 //
 // hooks for custom cache dialogs
@@ -83,31 +80,28 @@ extern	void	(*finishcachebox)	(void);
 
 // just for the score box reshifting
 
-void CAL_ShiftSprite (unsigned segment,unsigned source,unsigned dest,
-	unsigned width, unsigned height, unsigned pixshift, boolean domask);
+//void CAL_ShiftSprite (unsigned segment,unsigned source,unsigned dest,unsigned width, unsigned height, unsigned pixshift, boolean domask);
 
 //===========================================================================
 
 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);
+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_CacheAudioChunk (int chunk);
-void CA_LoadAllSounds (void);
+//void CA_CacheAudioChunk (int chunk);
+//void CA_LoadAllSounds (void);
 
-void CA_UpLevel (void);
+/*void CA_UpLevel (void);
 void CA_DownLevel (void);
 
 void CA_SetAllPurge (void);
@@ -120,5 +114,5 @@ void CA_ClearAllMarks (void);
 void CA_CacheGrChunk (int chunk);
 void CA_CacheMap (int mapnum);
 
-void CA_CacheMarks (char *title);
-
+void CA_CacheMarks (char *title);*/
+#endif