X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_ca.c;h=169c4a8539691ecbc600f7d6d604417d09c6889f;hb=2c112ee6852e6db1026bcbf6e537928a65e32bdf;hp=f74a5710a4349999c819f619c959e02f890c7f2d;hpb=2671c2fbb3ae37b5b9e20182a51b5aa6fb7220ec;p=16.git

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index f74a5710..169c4a85 100644
--- 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
 
@@ -76,8 +79,6 @@ void		_seg	*grsegs[NUMCHUNKS];
 byte		far	grneeded[NUMCHUNKS];
 byte		ca_levelbit,ca_levelnum;*/
 
-int			profilehandle,debughandle;
-
 void	(*drawcachebox)		(char *title, unsigned numcache);
 void	(*updatecachebox)	(void);
 void	(*finishcachebox)	(void);
@@ -173,15 +174,15 @@ 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);
+	gvar->handle.debughandle = open("debug.16", O_CREAT | O_WRONLY | O_TEXT);
 }
 
-void CA_CloseDebug(void)
+void CA_CloseDebug(global_game_variables_t *gvar)
 {
-	close(debughandle);
+	close(gvar->handle.debughandle);
 }
 
 
@@ -218,22 +219,21 @@ 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;
+	/*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;
+	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)
+	}
+
+	if(!fat&&!segm)
 	{*/
-		__asm
-		{
+		__asm {
 			push	ds
 			mov	bx,[handle]
 			mov	cx,[WORD PTR length]
@@ -246,17 +246,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;
+#endif
+	return flag;
 	//}else return 0;//todo: EXPAND!!!
 }
 
@@ -274,22 +291,21 @@ End:
 boolean CA_FarWrite(int handle, byte huge *source, dword length, mminfo_t *mm)
 {
 	boolean flag;
-	/*dword fat=0;
-	word segm=0;
+	/*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;
+	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)
+
+	if(!fat&&!segm)
 	{*/
-		__asm
-		{
+		__asm {
 			push	ds
 			mov	bx,[handle]
 			mov	cx,[WORD PTR length]
@@ -302,17 +318,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;
+#endif
+	return flag;
 	//}else return 0;
 }
 
@@ -330,7 +363,7 @@ End:
 boolean CA_ReadFile(char *filename, memptr *ptr, mminfo_t *mm)
 {
 	int handle;
-	dword size;
+	dword size;
 	//long size;
 
 	if((handle = open(filename,O_RDONLY | O_BINARY, S_IREAD)) == -1)
@@ -361,7 +394,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;
+	dword size;
 	//long size;
 
 	if((handle = open(filename,O_RDONLY | O_BINARY, S_IREAD)) == -1)
@@ -1044,12 +1077,14 @@ 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);
+	gvar->handle.profilehandle = open("profile.16", O_CREAT | O_WRONLY | O_TEXT);
 #endif
+// 	unlink("debug0.16");
+// 	gvar->handle.showmemhandle = open("debug0.16", O_CREAT | O_WRONLY | O_TEXT);
 /*++++
 // MDM begin - (GAMERS EDGE)
 //
@@ -1106,11 +1141,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);