X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_ca.c;h=4ee50576d0a8ade086392ba5fbb2fcc475176dbb;hb=85f8cfe15ac28a5ef39f8d14d3109d1cdbccf616;hp=fe76ec2c4ad5f8ef5184824ca3b6556708715766;hpb=1ac770860f019965706c1c3e07df40ff9849dfb0;p=16.git

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index fe76ec2c..4ee50576 100644
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -74,9 +74,9 @@ byte		_seg	*audiosegs[NUMSNDCHUNKS];
 void		_seg	*grsegs[NUMCHUNKS];
 
 byte		far	grneeded[NUMCHUNKS];
-byte		ca_levelbit,ca_levelnum;
+byte		ca_levelbit,ca_levelnum;*/
 
-int			profilehandle,debughandle;*/
+int			profilehandle,debughandle;
 
 void	(*drawcachebox)		(char *title, unsigned numcache);
 void	(*updatecachebox)	(void);
@@ -173,7 +173,6 @@ long GRFILEPOS(int c)
 =
 ============================
 */
-/*++++
 void CA_OpenDebug(void)
 {
 	unlink("DEBUG.TXT");
@@ -182,8 +181,8 @@ void CA_OpenDebug(void)
 
 void CA_CloseDebug(void)
 {
-	close debughandle);
-}*/
+	close(debughandle);
+}
 
 
 
@@ -216,13 +215,15 @@ void CAL_GetGrChunkLength (int chunk)
 ==========================
 */
 
-boolean CA_FarRead(int handle, byte huge *dest, dword length)
+boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm)
 {
 	boolean flag;
 	dword fat=0;
-	word segm=0;
+	word segm=0;
+	//if(mm->EMSVer<0x40)
 	if(length>0xfffflu)
 	{
+		printf("pee\n");
 		segm=(length%0xfffflu)-1;
 		fat=segm*0xfffflu;
 		length-=fat;
@@ -270,13 +271,15 @@ End:
 ==========================
 */
 
-boolean CA_FarWrite(int handle, byte huge *source, dword length)
+boolean CA_FarWrite(int handle, byte huge *source, dword length, mminfo_t *mm)
 {
 	boolean flag;
 	dword fat=0;
-	word segm=0;
+	word segm=0;
+	//if(mm->EMSVer<0x40)
 	if(length>0xfffflu)
 	{
+		printf("pee\n");
 		segm=(length%0xfffflu)-1;
 		fat=segm*0xfffflu;
 		length-=fat;
@@ -324,7 +327,7 @@ End:
 ==========================
 */
 
-boolean CA_ReadFile(char *filename, memptr *ptr)
+boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)
 {
 	int handle;
 	dword size;
@@ -333,7 +336,7 @@ boolean CA_ReadFile(char *filename, memptr *ptr)
 		return false;
 
 	size = filelength(handle);
-	if(!CA_FarRead(handle,*ptr,size))
+	if(!CA_FarRead(handle,*ptr,size, mm))
 	{
 		close(handle);
 		return false;
@@ -364,7 +367,7 @@ boolean CA_LoadFile(char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi)
 
 	size = filelength (handle);
 	MM_GetPtr(ptr,size, mm, mmi);
-	if(!CA_FarRead(handle,*ptr,size))
+	if(!CA_FarRead(handle,*ptr,size, mm))
 	{
 		close(handle);
 		return false;