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 6cde80743d694b6a083795bf48fe8be5e967ad48..6511ef176ab649739d61e14ed50b1645c4c27108 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1235,7 +1235,7 @@ void CA_Shutdown(global_game_variables_t *gvar)
 #endif\r
        close(gvar->handle.showmemhandle);\r
 \r
-       close(gvar->ca.file.maphandle);\r
+       close(*(gvar->ca.file.maphandle));\r
 /*++++\r
        close(grhandle);\r
        close(audiohandle);*/\r
@@ -1817,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
@@ -1831,37 +1831,29 @@ 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 (gvar->ca.map.mapon>-1 && gvar->ca.map.mapheaderseg[gvar->ca.map.mapon])\r
+//             MM_SetPurge (&(memptr)gvar->ca.map.mapheaderseg[gvar-ca.map.mapon],3);\r
        for (plane=0;plane<MAPPLANES;plane++)\r
-               if (mapsegs[plane])\r
-                       MM_FreePtr (&(memptr)mapsegs[plane]);\r
+               if (gvar->ca.map.mapsegs[plane])\r
+                       MM_FreePtr (&(memptr)gvar->ca.map.mapsegs[plane]);\r
 \r
-       mapon = mapnum;\r
+       gvar->ca.map.mapon = gvar->ca.map.mapnum;\r
 \r
 \r
 //\r
 // load map header\r
 // The header will be cached if it is still around\r
 //\r
-       if (!mapheaderseg[mapnum])\r
+       if (!gvar->ca.map.mapheaderseg[gvar->ca.map.mapnum])\r
        {\r
-               pos = ((mapfiletype     _seg *)tinf)->headeroffsets[mapnum];\r
+               pos = ((__segmement *)tinf)->headeroffsets[gvar->ca.mapnum];\r
                if (pos<0)                                              // $FFFFFFFF start is a sparse map\r
-                 Quit ("CA_CacheMap: Tried to load a non existent map!");\r
+                 printf("CA_CacheMap: Tried to load a non existent map!");\r
 \r
-               MM_GetPtr(&(memptr)mapheaderseg[mapnum],sizeof(maptype));\r
+               MM_GetPtr(&(memptr)gvar->ca.mapheaderseg[mapnum],sizeof(maptype));\r
                lseek(maphandle,pos,SEEK_SET);\r
                CA_FarRead (maphandle,(memptr)mapheaderseg[mapnum],sizeof(maptype));\r
        }\r