wwww yakuji wwww ca use to load maps w hmmm cachemap wwww

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

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 67bd4f400bb9e3505da830a9e080fdb778b66991..ec62a170a4cd267d5d4e8d88968453c6558c4685 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1102,8 +1102,8 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 //\r
 // open the data file\r
 //\r
-//todo multiple files\r
-       if ((gvar->ca.file.maphandles[0] = open("data/test.map",\r
+//TODO: multiple files\r
+       if ((gvar->ca.file.maphandle[0] = open("data/test.map",\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
        {\r
                printf("Can't open data/test.map!");\r
@@ -1234,8 +1234,9 @@ void CA_Shutdown(global_game_variables_t *gvar)
        close(gvar->handle.profilehandle);\r
 #endif\r
        close(gvar->handle.showmemhandle);\r
+\r
+       close(*(gvar->ca.file.maphandle));\r
 /*++++\r
-       close(maphandle);\r
        close(grhandle);\r
        close(audiohandle);*/\r
 }\r
@@ -1816,8 +1817,8 @@ void CA_CacheGrChunk (int chunk)
 =\r
 ======================\r
 */\r
-/*++++\r
-void CA_CacheMap (int mapnum)\r
+/*++++ fuckin segments!\r
+void CA_CacheMap (global_game_variables_t *gvar)\r
 {\r
        long    pos,compressed;\r
        int             plane;\r
@@ -1830,19 +1831,11 @@ void CA_CacheMap (int mapnum)
 #endif\r
 \r
 \r
-// MDM begin - (GAMERS EDGE)\r
-//\r
-       if (!FindFile("GAMEMAPS."EXT,NULL,1))\r
-               Quit("CA_CacheMap(): Can't find level files.");\r
-//\r
-// MDM end\r
-\r
-\r
 //\r
 // free up memory from last map\r
 //\r
-       if (mapon>-1 && mapheaderseg[mapon])\r
-               MM_SetPurge (&(memptr)mapheaderseg[mapon],3);\r
+       if (mapon>-1 && mapheaderseg[gvar->ca.mapon])\r
+               MM_SetPurge (&(memptr)mapheaderseg[gvar-ca.mapon],3);\r
        for (plane=0;plane<MAPPLANES;plane++)\r
                if (mapsegs[plane])\r
                        MM_FreePtr (&(memptr)mapsegs[plane]);\r