X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2F16_ca.c;h=1b3020790c144614ee94eff1eaf0b450f0a1cddf;hb=243e22dc4fb6ae069348ac984f79ae7827747be1;hp=0358a50559361b1ef53e48fe0cf389abe1349c73;hpb=c5f3fe262b69bab48324e4b4b50b153adcef830a;p=16.git

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 0358a505..1b302079 100755
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -375,6 +375,17 @@ boolean CA_ReadFile(char *filename, memptr *ptr, global_game_variables_t *gvar)
 		return false;
 
 	size = filelength(handle);
+#ifdef __DEBUG_CA__
+	if(dbg_debugca>0){
+		printf("===============================================================================\n");
+		printf("		CA_ReadFile\n");
+		printf("===============================================================================\n");
+		//%04x
+		printf("	ptr=%Fp\n", ptr);
+		printf("	*ptr=%Fp\n", *ptr);
+		printf("	&ptr=%Fp\n", &ptr);
+	}
+#endif
 	if(!CA_FarRead(handle,*ptr,size, gvar))
 	{
 		close(handle);
@@ -1123,8 +1134,10 @@ dinorm:
 
 void CAL_SetupMapFile (global_game_variables_t *gvar)
 {
+#ifndef MAPHEADERLINKED
 	int handle;
 	long length;
+#endif
 
 //
 // load maphead.ext (offsets and tileinfo for map file)
@@ -1137,9 +1150,9 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 	MM_GetPtr (MEMPTR gvar->ca.tinf,length,gvar);
 	CA_FarRead(handle, gvar->ca.tinf, length,gvar);
 	close(handle);
-#else
+//#else
 
-	tinf = (byte _seg *)FP_SEG(&maphead);
+	gvar->ca.tinf = (byte _seg *)FP_SEG(&maphead);
 
 #endif
 
@@ -1147,7 +1160,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 // open the data file
 //
 //TODO: multiple files
-	if ((gvar->ca.file.maphandle[0] = open("data/test.map",
+	if ((gvar->ca.file.maphandle = open("data/test.map",
 		 O_RDONLY | O_BINARY, S_IREAD)) == -1)
 		Quit (gvar, "Can't open data/test.map!");
 /*#ifdef MAPHEADERLINKED
@@ -1283,10 +1296,9 @@ void CA_Shutdown(global_game_variables_t *gvar)
 #endif
  	close(gvar->handle.showmemhandle);
 
-	close(*(gvar->ca.file.maphandle));
-/*++++
-	close(grhandle);
-	close(audiohandle);*/
+	close(gvar->ca.file.maphandle);
+	close(gvar->ca.file.grhandle);
+	close(gvar->ca.file.audiohandle);
 }
 
 //===========================================================================
@@ -1805,7 +1817,7 @@ void CA_CacheGrChunk (int chunk)
 	byte	far *source;
 	int		next;
 
-	gvar->video.grneeded[chunk] |= ca_levelbit;		// make sure it doesn't get removed
+	gvar->ca.grneeded[chunk] |= ca_levelbit;		// make sure it doesn't get removed
 	if (grsegs[chunk])
 	{
 		MM_SetPurge (&grsegs[chunk],0);