X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2F16_ca.c;h=e2b6cef9a1ec70871a1e41eb800fb12d5170b745;hb=1ea8e6d438d3af98b050dc7bcd8b935a4bec3511;hp=f74a5710a4349999c819f619c959e02f890c7f2d;hpb=25d5636b925df58cf5614e5f478224d044a58803;p=16.git

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
old mode 100644
new mode 100755
index f74a5710..e2b6cef9
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -31,7 +31,10 @@ loaded into the data segment
 */
 
 #include "src/lib/16_ca.h"
-//#include "ID_STRS.H"
+#pragma hdrstop
+
+#pragma warn -pro
+#pragma warn -use
 
 //#define THREEBYTEGRSTARTS
 
@@ -45,7 +48,7 @@ loaded into the data segment
 
 typedef struct
 {
-  unsigned bit0,bit1;	// 0-255 is a character, > is a pointer to a node
+  word bit0,bit1;	// 0-255 is a character, > is a pointer to a node
 } huffnode;
 
 
@@ -73,10 +76,7 @@ maptype		_seg	*mapheaderseg[NUMMAPS];
 byte		_seg	*audiosegs[NUMSNDCHUNKS];
 void		_seg	*grsegs[NUMCHUNKS];
 
-byte		far	grneeded[NUMCHUNKS];
-byte		ca_levelbit,ca_levelnum;*/
-
-int			profilehandle,debughandle;
+byte		far	grneeded[NUMCHUNKS];*/
 
 void	(*drawcachebox)		(char *title, unsigned numcache);
 void	(*updatecachebox)	(void);
@@ -173,15 +173,21 @@ long GRFILEPOS(int c)
 =
 ============================
 */
-void CA_OpenDebug(void)
+void CA_OpenDebug(global_game_variables_t *gvar)
 {
-	unlink("debug.16");
-	debughandle = open("debug.16", O_CREAT | O_WRONLY | O_TEXT);
+#ifdef __BORLANDC__
+	unlink("debug.16b");
+	gvar->handle.debughandle = open("debug.16b", O_CREAT | O_WRONLY | O_TEXT);
+#endif
+#ifdef __WATCOMC__
+	unlink("debug.16w");
+	gvar->handle.debughandle = open("debug.16w", O_CREAT | O_WRONLY | O_TEXT);
+#endif
 }
 
-void CA_CloseDebug(void)
+void CA_CloseDebug(global_game_variables_t *gvar)
 {
-	close(debughandle);
+	close(gvar->handle.debughandle);
 }
 
 
@@ -218,22 +224,22 @@ void CAL_GetGrChunkLength (int chunk)
 boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm)
 {
 	boolean flag;
-	/*dword fat=0;
-	word segm=0;
-	//if(mm->EMSVer<0x40)
-	if(length>0xfffflu)
-	{
-		printf("File is a fat bakapee\n");
-		segm=(length%0xfffflu)-1;
-		fat=segm*0xfffflu;
-		length-=fat;
-//		printf("CA_FarRead doesn't support 64K reads yet!\n");
-	}
-
-	if(!fat&&!segm)
-	{*/
-		__asm
-		{
+	//dword fat=0;
+	//word segm=0;
+	if(mm->EMSVer<0x40)
+	if(length>0xfffflu)
+	{
+		printf("File is a fat bakapee\n");
+		//segm=(length%0xfffflu)-1;
+		//fat=segm*0xfffflu;
+		//length-=fat;
+		printf("CA_FarRead doesn't support 64K reads yet!\n");
+		return 0;//TODO: EXPAND!!!
+	}
+
+	//if(!fat&&!segm)
+	//{
+		__asm {
 			push	ds
 			mov	bx,[handle]
 			mov	cx,[WORD PTR length]
@@ -246,18 +252,34 @@ boolean CA_FarRead(int handle, byte huge *dest, dword length, mminfo_t *mm)
 			mov	errno,ax
 			mov	flag,0
 			jmp End
+#ifdef __BORLANDC__
+		}
+#endif
 good:
+#ifdef __BORLANDC__
+		__asm {
+#endif
 			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 {
+#endif
 			mov	flag,1
+#ifdef __BORLANDC__
+		}
+#endif
 End:
+#ifdef __WATCOMC__
 		}
-	return flag;
-	//}else return 0;//todo: EXPAND!!!
+#endif
+	return flag;
 }
 
 
@@ -274,22 +296,22 @@ End:
 boolean CA_FarWrite(int handle, byte huge *source, dword length, mminfo_t *mm)
 {
 	boolean flag;
-	/*dword fat=0;
-	word segm=0;
-	//if(mm->EMSVer<0x40)
-	if(length>0xfffflu)
-	{
-		printf("File is a fat bakapee\n");
-		segm=(length%0xfffflu)-1;
-		fat=segm*0xfffflu;
-		length-=fat;
-//		printf("CA_FarRead doesn't support 64K reads yet!\n");
+	//dword fat=0;
+	//word segm=0;
+	if(mm->EMSVer<0x40)
+	if(length>0xfffflu)
+	{
+		printf("File is a fat bakapee\n");
+		//segm=(length%0xfffflu)-1;
+		//fat=segm*0xfffflu;
+		//length-=fat;
+		printf("CA_FarRead doesn't support 64K reads yet!\n");
+		return 0;
 	}
-
-	if(!fat&&!segm)
-	{*/
-		__asm
-		{
+
+	//if(!fat&&!segm)
+	//{
+		__asm {
 			push	ds
 			mov	bx,[handle]
 			mov	cx,[WORD PTR length]
@@ -302,18 +324,34 @@ boolean CA_FarWrite(int handle, byte huge *source, dword length, mminfo_t *mm)
 			mov	errno,ax
 			mov flag,0
 			jmp End
+#ifdef __BORLANDC__
+		}
+#endif
 good:
+#ifdef __BORLANDC__
+		__asm {
+#endif
 			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 {
+#endif
 			mov	flag,1
+#ifdef __BORLANDC__
+		}
+#endif
 End:
+#ifdef __WATCOMC__
 		}
-	return flag;
-	//}else return 0;
+#endif
+	return flag;
 }
 
 
@@ -330,7 +368,7 @@ End:
 boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)
 {
 	int handle;
-	dword size;
+	sdword size;
 	//long size;
 
 	if((handle = open(filename,O_RDONLY | O_BINARY, S_IREAD)) == -1)
@@ -338,6 +376,38 @@ boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)
 
 	size = filelength(handle);
 	if(!CA_FarRead(handle,*ptr,size, mm))
+	{
+		close (handle);
+		return false;
+	}
+	close (handle);
+	return true;
+}
+
+
+/*
+==========================
+=
+= CA_WriteFile
+=
+= Writes a file from a memory buffer
+=
+==========================
+*/
+
+boolean CA_WriteFile (char *filename, void far *ptr, long length, mminfo_t *mm)
+{
+	int handle;
+	sdword size;
+	//long size;
+
+	handle = open(filename,O_CREAT | O_BINARY | O_WRONLY,
+				S_IREAD | S_IWRITE | S_IFREG);
+
+	if (handle == -1)
+		return false;
+
+	if (!CA_FarWrite (handle,ptr,length, mm))
 	{
 		close(handle);
 		return false;
@@ -361,7 +431,7 @@ boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)
 boolean CA_LoadFile(char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi)
 {
 	int handle;
-	dword size;
+	sdword size;
 	//long size;
 
 	if((handle = open(filename,O_RDONLY | O_BINARY, S_IREAD)) == -1)
@@ -428,7 +498,7 @@ void CAL_OptimizeNodes(huffnode *table)
 ======================
 */
 
-/*++++void CAL_HuffExpand (byte huge *source, byte huge *dest,
+void CAL_HuffExpand (byte huge *source, byte huge *dest,
   long length,huffnode *hufftable)
 {
 //  unsigned bit,byte,node,code;
@@ -462,9 +532,8 @@ void CAL_OptimizeNodes(huffnode *table)
 // expand less than 64k of data
 //--------------------------
 
-	__asm
-	{
-		mov	bx,[headptr]
+	__asm {
+////		mov	bx,[headptr]
 
 		mov	si,[sourceoff]
 		mov	di,[destoff]
@@ -475,38 +544,63 @@ void CAL_OptimizeNodes(huffnode *table)
 		mov	ch,[si]				// load first byte
 		inc	si
 		mov	cl,1
-
+#ifdef __BORLANDC__
+	}
+#endif
 expandshort:
+#ifdef __BORLANDC__
+	__asm {
+#endif
 		test	ch,cl			// bit set?
 		jnz	bit1short
 		mov	dx,[ss:bx]			// take bit0 path from node
 		shl	cl,1				// advance to next bit position
 		jc	newbyteshort
 		jnc	sourceupshort
-
+#ifdef __BORLANDC__
+	}
+#endif
 bit1short:
-asm	mov	dx,[ss:bx+2]		// take bit1 path
-asm	shl	cl,1				// advance to next bit position
-asm	jnc	sourceupshort
-
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		mov	dx,[ss:bx+2]		// take bit1 path
+		shl	cl,1				// advance to next bit position
+		jnc	sourceupshort
+#ifdef __BORLANDC__
+	}
+#endif
 newbyteshort:
-asm	mov	ch,[si]				// load next byte
-asm	inc	si
-asm	mov	cl,1				// back to first bit
-
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		mov	ch,[si]				// load next byte
+		inc	si
+		mov	cl,1				// back to first bit
+#ifdef __BORLANDC__
+	}
+#endif
 sourceupshort:
-asm	or	dh,dh				// if dx<256 its a byte, else move node
-asm	jz	storebyteshort
-asm	mov	bx,dx				// next node = (huffnode *)code
-asm	jmp	expandshort
-
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		or	dh,dh				// if dx<256 its a byte, else move node
+		jz	storebyteshort
+		mov	bx,dx				// next node = (huffnode *)code
+		jmp	expandshort
+#ifdef __BORLANDC__
+	}
+#endif
 storebyteshort:
-asm	mov	[es:di],dl
-asm	inc	di					// write a decopmpressed byte out
-asm	mov	bx,[headptr]		// back to the head node for next bit
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		mov	[es:di],dl
+		inc	di					// write a decopmpressed byte out
+////		mov	bx,[headptr]		// back to the head node for next bit
 
-asm	cmp	di,ax				// done?
-asm	jne	expandshort
+		cmp	di,ax				// done?
+		jne	expandshort
 	}
 	}
 	else
@@ -518,72 +612,107 @@ asm	jne	expandshort
 
   length--;
 
-	__asm
-	{
-asm mov	bx,[headptr]
-asm	mov	cl,1
-
-asm	mov	si,[sourceoff]
-asm	mov	di,[destoff]
-asm	mov	es,[destseg]
-asm	mov	ds,[sourceseg]
+	__asm {
+////		mov	bx,[headptr]
+		mov	cl,1
 
-asm	lodsb			// load first byte
+		mov	si,[sourceoff]
+		mov	di,[destoff]
+		mov	es,[destseg]
+		mov	ds,[sourceseg]
 
+		lodsb			// load first byte
+#ifdef __BORLANDC__
+	}
+#endif
 expand:
-asm	test	al,cl		// bit set?
-asm	jnz	bit1
-asm	mov	dx,[ss:bx]	// take bit0 path from node
-asm	jmp	gotcode
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		test	al,cl		// bit set?
+		jnz	bit1
+		mov	dx,[ss:bx]	// take bit0 path from node
+		jmp	gotcode
+#ifdef __BORLANDC__
+	}
+#endif
 bit1:
-asm	mov	dx,[ss:bx+2]	// take bit1 path
-
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		mov	dx,[ss:bx+2]	// take bit1 path
+#ifdef __BORLANDC__
+	}
+#endif
 gotcode:
-asm	shl	cl,1		// advance to next bit position
-asm	jnc	sourceup
-asm	lodsb
-asm	cmp	si,0x10		// normalize ds:si
-asm  	jb	sinorm
-asm	mov	cx,ds
-asm	inc	cx
-asm	mov	ds,cx
-asm	xor	si,si
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		shl	cl,1		// advance to next bit position
+		jnc	sourceup
+		lodsb
+		cmp	si,0x10		// normalize ds:si
+		jb	sinorm
+		mov	cx,ds
+		inc	cx
+		mov	ds,cx
+		xor	si,si
+#ifdef __BORLANDC__
+	}
+#endif
 sinorm:
-asm	mov	cl,1		// back to first bit
-
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		mov	cl,1		// back to first bit
+#ifdef __BORLANDC__
+	}
+#endif
 sourceup:
-asm	or	dh,dh		// if dx<256 its a byte, else move node
-asm	jz	storebyte
-asm	mov	bx,dx		// next node = (huffnode *)code
-asm	jmp	expand
-
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		or	dh,dh		// if dx<256 its a byte, else move node
+		jz	storebyte
+		mov	bx,dx		// next node = (huffnode *)code
+		jmp	expand
+#ifdef __BORLANDC__
+	}
+#endif
 storebyte:
-asm	mov	[es:di],dl
-asm	inc	di		// write a decopmpressed byte out
-asm	mov	bx,[headptr]	// back to the head node for next bit
-
-asm	cmp	di,0x10		// normalize es:di
-asm  	jb	dinorm
-asm	mov	dx,es
-asm	inc	dx
-asm	mov	es,dx
-asm	xor	di,di
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		mov	[es:di],dl
+		inc	di		// write a decopmpressed byte out
+////		mov	bx,[headptr]	// back to the head node for next bit
+
+		cmp	di,0x10		// normalize es:di
+		jb	dinorm
+		mov	dx,es
+		inc	dx
+		mov	es,dx
+		xor	di,di
+#ifdef __BORLANDC__
+	}
+#endif
 dinorm:
-
-asm	sub	[WORD PTR ss:length],1
-asm	jnc	expand
-asm  	dec	[WORD PTR ss:length+2]
-asm	jns	expand		// when length = ffff ffff, done
+#ifdef __BORLANDC__
+	__asm {
+#endif
+		sub	[WORD PTR ss:length],1
+		jnc	expand
+		dec	[WORD PTR ss:length+2]
+		jns	expand		// when length = ffff ffff, done
 	}
 	}
 
-	__asm
-	{
+	__asm {
 		mov	ax,ss
 		mov	ds,ax
 	}
 
-}*/
+}
 
 
 /*
@@ -849,7 +978,7 @@ asm	mov	ds,ax
 =
 ======================
 */
-
+////++++ enable!
 /*void CAL_SetupGrFile (void)
 {
 	int handle;
@@ -1044,12 +1173,30 @@ asm	mov	ds,ax
 ======================
 */
 
-void CA_Startup(void)
+void CA_Startup(global_game_variables_t *gvar)
 {
 #ifdef PROFILE
-	unlink("profile.16");
-	profilehandle = open("profile.16", O_CREAT | O_WRONLY | O_TEXT);
+#ifdef __BORLANDC__
+	unlink("profile.16b");
+	gvar->handle.profilehandle = open("profile.16b", O_CREAT | O_WRONLY | O_TEXT);
+#endif
+#ifdef __WATCOMC__
+	unlink("profile.16w");
+	gvar->handle.profilehandle = open("profile.16w", O_CREAT | O_WRONLY | O_TEXT);
 #endif
+#endif//profile
+
+#ifdef __BORLANDC__
+	unlink("meminfo.16b");
+	gvar->handle.showmemhandle = open("meminfo.16b", O_CREAT | O_WRONLY | O_TEXT);
+#endif
+#ifdef __WATCOMC__
+	unlink("meminfo.16w");
+	gvar->handle.showmemhandle = open("meminfo.16w", O_CREAT | O_WRONLY | O_TEXT);
+#endif
+/*	CAL_SetupMapFile ();
+	CAL_SetupGrFile ();
+	CAL_SetupAudioFile ();*/
 /*++++
 // MDM begin - (GAMERS EDGE)
 //
@@ -1082,13 +1229,13 @@ void CA_Startup(void)
 
 #ifndef NOGRAPHICS
 	CAL_SetupGrFile ();
-#endif
+#endif*/
 
-	mapon = -1;
-	ca_levelbit = 1;
-	ca_levelnum = 0;
+	gvar->ca.mapon = -1;
+	gvar->ca.ca_levelbit = 1;
+	gvar->ca.ca_levelnum = 0;
 
-	drawcachebox	= CAL_DialogDraw;
+/*	drawcachebox	= CAL_DialogDraw;
 	updatecachebox  = CAL_DialogUpdate;
 	finishcachebox	= CAL_DialogFinish;*/
 }
@@ -1106,11 +1253,12 @@ void CA_Startup(void)
 ======================
 */
 
-void CA_Shutdown(void)
+void CA_Shutdown(global_game_variables_t *gvar)
 {
 #ifdef PROFILE
-	close(profilehandle);
+	close(gvar->handle.profilehandle);
 #endif
+ 	close(gvar->handle.showmemhandle);
 /*++++
 	close(maphandle);
 	close(grhandle);
@@ -1633,7 +1781,7 @@ void CA_CacheGrChunk (int chunk)
 	byte	far *source;
 	int		next;
 
-	grneeded[chunk] |= ca_levelbit;		// make sure it doesn't get removed
+	gvar->video.grneeded[chunk] |= ca_levelbit;		// make sure it doesn't get removed
 	if (grsegs[chunk])
 	{
 		MM_SetPurge (&grsegs[chunk],0);
@@ -1857,15 +2005,14 @@ void CA_DownLevel (void)
 =
 ======================
 */
-/*
-void CA_ClearMarks (void)
+
+void CA_ClearMarks (global_game_variables_t *gvar)
 {
 	int i;
 
 	for (i=0;i<NUMCHUNKS;i++)
-		grneeded[i]&=~ca_levelbit;
+		gvar->video.grneeded[i]&=~gvar->ca.ca_levelbit;
 }
-*/
 
 //===========================================================================
 
@@ -1878,14 +2025,13 @@ void CA_ClearMarks (void)
 =
 ======================
 */
-/*
-void CA_ClearAllMarks (void)
+
+void CA_ClearAllMarks (global_game_variables_t *gvar)
 {
-	_fmemset (grneeded,0,sizeof(grneeded));
-	ca_levelbit = 1;
-	ca_levelnum = 0;
+	_fmemset (gvar->video.grneeded,0,sizeof(gvar->video.grneeded));
+	gvar->ca.ca_levelbit = 1;
+	gvar->ca.ca_levelnum = 0;
 }
-*/
 
 //===========================================================================
 
@@ -1897,9 +2043,14 @@ void CA_ClearAllMarks (void)
 ======================
 */
 /*++++
-void CA_FreeGraphics (void)
+void CA_SetGrPurge (void)
 {
-	int	i;
+	int i;
+
+//
+// free graphics
+//
+	CA_ClearMarks ();
 
 	for (i=0;i<NUMCHUNKS;i++)
 		if (grsegs[i])
@@ -1949,20 +2100,7 @@ void CA_SetAllPurge (void)
 //
 // free graphics
 //
-	CA_FreeGraphics ();
-}
-
-
-void CA_SetGrPurge (void)
-{
-	int i;
-
-//
-// free graphics
-//
-	for (i=0;i<NUMCHUNKS;i++)
-		if (grsegs[i])
-			MM_SetPurge (&(memptr)grsegs[i],3);
+	CA_SetGrPurge ();
 }*/
 
 
@@ -2107,7 +2245,7 @@ void CA_CacheMarks (char *title)
 // go through and make everything not needed purgable
 //
 	for (i=0;i<NUMCHUNKS;i++)
-		if (grneeded[i]&ca_levelbit)
+		if (gvar->video.grneeded[i]&ca_levelbit)
 		{
 			if (grsegs[i])					// its allready in memory, make
 				MM_SetPurge(&grsegs[i],0);	// sure it stays there!
@@ -2146,7 +2284,7 @@ void CA_CacheMarks (char *title)
 	bufferstart = bufferend = 0;		// nothing good in buffer now
 
 	for (i=0;i<NUMCHUNKS;i++)
-		if ( (grneeded[i]&ca_levelbit) && !grsegs[i])
+		if ( (gvar->video.grneeded[i]&ca_levelbit) && !grsegs[i])
 		{
 //
 // update thermometer
@@ -2180,7 +2318,7 @@ void CA_CacheMarks (char *title)
 					while ( next < NUMCHUNKS )
 					{
 						while (next < NUMCHUNKS &&
-						!(grneeded[next]&ca_levelbit && !grsegs[next]))
+						!(gvar->video.grneeded[next]&ca_levelbit && !grsegs[next]))
 							next++;
 						if (next == NUMCHUNKS)
 							continue;