X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_ca.c;h=7298ca3f6639ae93daa497da0a3419d8dbe68b25;hb=0a20122c69db40134055fec030af5a468eb266a3;hp=3f3951736fc9eb5f05915159a84d891a5d728a06;hpb=db958cd058eef6e3f09d3144b14ce2699aaffec6;p=16.git

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 3f395173..7298ca3f 100755
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -221,12 +221,12 @@ void CAL_GetGrChunkLength (int chunk)
 ==========================
 */
 
-boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm)
+boolean CA_FarRead(int handle, byte huge *dest, dword length, global_game_variables_t *gvar)
 {
-	boolean flag;
+	boolean flag=0;
 	//dword fat=0;
 	//word segm=0;
-	if(mm->EMSVer<0x40)
+	if(gvar->pm.emm.EMSVer<0x40)
 	if(length>0xfffflu)
 	{
 		printf("File is a fat bakapee\n");
@@ -239,45 +239,45 @@ boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm)
 
 	//if(!fat&&!segm)
 	//{
-		__asm {
-			push	ds
-			mov	bx,[handle]
-			mov	cx,[WORD PTR length]
-			mov	dx,[WORD PTR dest]
-			mov	ds,[WORD PTR dest+2]
-			mov	ah,0x3f				// READ w/handle
-			int	21h
-			pop	ds
-			jnc	good
-			mov	errno,ax
-			mov	flag,0
-			jmp End
+	__asm {
+		push	ds
+		mov	bx,[handle]
+		mov	cx,[WORD PTR length]
+		mov	dx,[WORD PTR dest]
+		mov	ds,[WORD PTR dest+2]
+		mov	ah,0x3f				// READ w/handle
+		int	21h
+		pop	ds
+		jnc	good
+		mov	errno,ax
+		mov	flag,0
+		jmp End
 #ifdef __BORLANDC__
-		}
+	}
 #endif
 good:
 #ifdef __BORLANDC__
-		__asm {
+	__asm {
 #endif
-			cmp	ax,[WORD PTR length]
-			je	done
-//			errno = EINVFMT;			// user manager knows this is bad read
-			mov	flag,0
-			jmp End
+		cmp	ax,[WORD PTR length]
+		je	done
+//		errno = EINVFMT;			// user manager knows this is bad read
+		mov	flag,0
+		jmp End
 #ifdef __BORLANDC__
-		}
+	}
 #endif
 done:
 #ifdef __BORLANDC__
-		__asm {
+	__asm {
 #endif
-			mov	flag,1
+		mov	flag,1
 #ifdef __BORLANDC__
-		}
+	}
 #endif
 End:
 #ifdef __WATCOMC__
-		}
+	}
 #endif
 	return flag;
 }
@@ -293,12 +293,12 @@ End:
 ==========================
 */
 
-boolean CA_FarWrite(int handle, byte huge *source, dword length, mminfo_t *mm)
+boolean CA_FarWrite(int handle, byte huge *source, dword length, global_game_variables_t *gvar)
 {
-	boolean flag;
+	boolean flag=0;
 	//dword fat=0;
 	//word segm=0;
-	if(mm->EMSVer<0x40)
+	if(gvar->pm.emm.EMSVer<0x40)
 	if(length>0xfffflu)
 	{
 		printf("File is a fat bakapee\n");
@@ -311,45 +311,45 @@ boolean CA_FarWrite(int handle, byte huge *source, dword length, mminfo_t *mm)
 
 	//if(!fat&&!segm)
 	//{
-		__asm {
-			push	ds
-			mov	bx,[handle]
-			mov	cx,[WORD PTR length]
-			mov	dx,[WORD PTR source]
-			mov	ds,[WORD PTR source+2]
-			mov	ah,0x40			// WRITE w/handle
-			int	21h
-			pop	ds
-			jnc	good
-			mov	errno,ax
-			mov flag,0
-			jmp End
+	__asm {
+		push	ds
+		mov	bx,[handle]
+		mov	cx,[WORD PTR length]
+		mov	dx,[WORD PTR source]
+		mov	ds,[WORD PTR source+2]
+		mov	ah,0x40			// WRITE w/handle
+		int	21h
+		pop	ds
+		jnc	good
+		mov	errno,ax
+		mov flag,0
+		jmp End
 #ifdef __BORLANDC__
-		}
+	}
 #endif
 good:
 #ifdef __BORLANDC__
-		__asm {
+	__asm {
 #endif
-			cmp	ax,[WORD PTR length]
-			je	done
-			//errno = ENOMEM;				// user manager knows this is bad write
-			mov	flag,0
-			jmp End
+		cmp	ax,[WORD PTR length]
+		je	done
+//		errno = ENOMEM;				// user manager knows this is bad write
+		mov	flag,0
+		jmp End
 #ifdef __BORLANDC__
-		}
+	}
 #endif
 done:
 #ifdef __BORLANDC__
-		__asm {
+	__asm {
 #endif
-			mov	flag,1
+		mov	flag,1
 #ifdef __BORLANDC__
-		}
+	}
 #endif
 End:
 #ifdef __WATCOMC__
-		}
+	}
 #endif
 	return flag;
 }
@@ -365,7 +365,7 @@ End:
 ==========================
 */
 
-boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)
+boolean CA_ReadFile(char *filename, memptr *ptr, global_game_variables_t *gvar)
 {
 	int handle;
 	sdword size;
@@ -375,7 +375,7 @@ boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)
 		return false;
 
 	size = filelength(handle);
-	if(!CA_FarRead(handle,*ptr,size, mm))
+	if(!CA_FarRead(handle,*ptr,size, gvar))
 	{
 		close (handle);
 		return false;
@@ -395,10 +395,10 @@ 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_WriteFile (char *filename, void far *ptr, long length, global_game_variables_t *gvar)
 {
 	int handle;
-	sdword size;
+	//sdword size;
 	//long size;
 
 	handle = open(filename,O_CREAT | O_BINARY | O_WRONLY,
@@ -407,7 +407,7 @@ boolean CA_WriteFile (char *filename, void far *ptr, long length, mminfo_t *mm)
 	if (handle == -1)
 		return false;
 
-	if (!CA_FarWrite (handle,ptr,length, mm))
+	if (!CA_FarWrite (handle,ptr,length, gvar))
 	{
 		close(handle);
 		return false;
@@ -428,7 +428,7 @@ 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_LoadFile(char *filename, memptr *ptr, global_game_variables_t *gvar)
 {
 	int handle;
 	sdword size;
@@ -437,9 +437,9 @@ boolean CA_LoadFile(char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi)
 	if((handle = open(filename,O_RDONLY | O_BINARY, S_IREAD)) == -1)
 		return false;
 
-	size = filelength (handle);
-	MM_GetPtr(ptr,size, mm, mmi);
-	if(!CA_FarRead(handle,*ptr,size, mm))
+	size = filelength(handle);
+	MM_GetPtr(ptr,size, gvar);
+	if(!CA_FarRead(handle,*ptr,size, gvar))
 	{
 		close(handle);
 		return false;
@@ -503,10 +503,10 @@ void CAL_HuffExpand (byte huge *source, byte huge *dest,
 {
 //  unsigned bit,byte,node,code;
   unsigned sourceseg,sourceoff,destseg,destoff,endoff;
-  huffnode *headptr;
+	huffnode *headptr;
 //  huffnode *nodeon;
 
-  headptr = hufftable+254;	// head node is allways node 254
+	headptr = hufftable+254;	// head node is allways node 254
 
   source++;	// normalize
   source--;
@@ -533,7 +533,7 @@ void CAL_HuffExpand (byte huge *source, byte huge *dest,
 //--------------------------
 
 	__asm {
-////		mov	bx,[headptr]
+		mov	bx,[word ptr headptr]
 
 		mov	si,[sourceoff]
 		mov	di,[destoff]
@@ -597,7 +597,7 @@ storebyteshort:
 #endif
 		mov	[es:di],dl
 		inc	di					// write a decopmpressed byte out
-////		mov	bx,[headptr]		// back to the head node for next bit
+		mov	bx,[word ptr headptr]		// back to the head node for next bit
 
 		cmp	di,ax				// done?
 		jne	expandshort
@@ -613,7 +613,7 @@ storebyteshort:
   length--;
 
 	__asm {
-////		mov	bx,[headptr]
+		mov	bx,[word ptr headptr]
 		mov	cl,1
 
 		mov	si,[sourceoff]
@@ -685,7 +685,7 @@ storebyte:
 #endif
 		mov	[es:di],dl
 		inc	di		// write a decopmpressed byte out
-////		mov	bx,[headptr]	// back to the head node for next bit
+		mov	bx,[word ptr headptr]	// back to the head node for next bit
 
 		cmp	di,0x10		// normalize es:di
 		jb	dinorm
@@ -902,7 +902,7 @@ void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,
 //
 // NOTE: A repeat count that produces 0xfff0 bytes can blow this!
 //
-	__asm{
+	__asm {
 		mov	bx,rlewtag
 		mov	si,sourceoff
 		mov	di,destoff
@@ -1102,8 +1102,8 @@ dinorm:
 
 void CAL_SetupMapFile (global_game_variables_t *gvar)
 {
-	int handle;
-	long length;
+// 	int handle;
+// 	long length;
 
 //
 // load maphead.ext (offsets and tileinfo for map file)
@@ -1111,7 +1111,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 // #ifndef MAPHEADERLINKED
 // 	if ((handle = open("MAPHEAD."EXT,
 // 		 O_RDONLY | O_BINARY, S_IREAD)) == -1)
-// 		Quit ("Can't open MAPHEAD."EXT"!");
+// 		printf("Can't open MAPHEAD."EXT"!");
 // 	length = filelength(handle);
 // 	MM_GetPtr (&(memptr)tinf,length);
 // 	CA_FarRead(handle, tinf, length);