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

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 96bb4b4849b5d215497c000733bdae8feb2bb465..ec62a170a4cd267d5d4e8d88968453c6558c4685 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -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,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

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 8373f8ee5cc5351b6f8e7f4000d45b68278a2aed..eedbfc9dc28f26f08ee603c7d37da6a2c8623258 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -191,8 +191,9 @@ typedef struct
 typedef struct\r
 {\r
        byte            ca_levelbit,ca_levelnum;\r
-       int             mapon;\r
+       int             mapon, mapnum;\r
        handle_t        file;           //files to open\r
+       //unsigned      _seg    *mapsegs[4];\r
        //_seg  *grsegs[NUMCHUNKS];\r
        //byte          far     grneeded[NUMCHUNKS];\r
        //huffnode huffnode;\r