p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

[16.git] / src / lib / 16_ca.c

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