bloody typedefstruct merging is going to be tricky

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

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index c85c3a7a3a83653e13367d488def136330b8637b..537e8ba8807c7b83a17fd50d07e5aa981120f46c 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -46,10 +46,10 @@ loaded into the data segment
 =============================================================================\r
 */\r
 \r
-typedef struct\r
+/*typedef struct\r
 {\r
   word bit0,bit1;      // 0-255 is a character, > is a pointer to a node\r
-} huffnode;\r
+} huffnode;*/\r
 \r
 \r
 /*typedef struct\r
@@ -1226,10 +1226,9 @@ void CA_Startup(global_game_variables_t *gvar)
 /*\r
        CAL_SetupGrFile ();\r
        CAL_SetupAudioFile ();*/\r
-\r
        CAL_SetupMapFile (gvar);\r
 \r
-       gvar->ca.map.mapon = -1;\r
+       gvar->ca.camap.mapon = -1;\r
        gvar->ca.ca_levelbit = 1;\r
        gvar->ca.ca_levelnum = 0;\r
 \r
@@ -1857,11 +1856,14 @@ void CA_CacheMap (global_game_variables_t *gvar)
 //\r
 // free up memory from last map\r
 //\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
+       if (gvar->ca.map.mapon>-1 && gvar->ca.map.mapheaderseg[gvar->ca.map.mapon])\r
+               MM_SetPurge (&((memptr)gvar->ca.map.mapheaderseg\r
+                                                                                       [(gvar->ca.map.mapon)]),\r
+\r
+ 3, &(gvar->mm));\r
        for (plane=0;plane<MAPPLANES;plane++)\r
                if (gvar->ca.map.mapsegs[plane])\r
-                       MM_FreePtr (&(memptr)gvar->ca.map.mapsegs[plane]);\r
+                       MM_FreePtr (&(memptr)gvar->ca.map.mapsegs[plane], &(gvar->mm));\r
 \r
        gvar->ca.map.mapon = gvar->ca.map.mapnum;\r
 \r
@@ -1872,7 +1874,8 @@ void CA_CacheMap (global_game_variables_t *gvar)
 //\r
        if (!gvar->ca.map.mapheaderseg[gvar->ca.map.mapnum])\r
        {\r
-               pos = ((__segmement *)tinf)->headeroffsets[gvar->ca.mapnum];\r
+               //pos = ((mapfiletype   _seg *)tinf)->headeroffsets[mapnum];\r
+               pos = ((_seg *)gvar->ca.map.tinf)->headeroffsets[gvar->ca.map.mapnum];\r
                if (pos<0)                                              // $FFFFFFFF start is a sparse map\r
                  printf("CA_CacheMap: Tried to load a non existent map!");\r
 \r
@@ -1881,7 +1884,7 @@ void CA_CacheMap (global_game_variables_t *gvar)
                CA_FarRead (maphandle,(memptr)mapheaderseg[mapnum],sizeof(maptype));\r
        }\r
        else\r
-               MM_SetPurge (&(memptr)mapheaderseg[mapnum],0);\r
+               MM_SetPurge (&(memptr)mapheaderseg[mapnum], 0, &(gvar->mm));\r
 \r
 //\r
 // load the planes in\r
@@ -1939,7 +1942,7 @@ void CA_CacheMap (global_game_variables_t *gvar)
                if (compressed>BUFFERSIZE)\r
                        MM_FreePtr(&bigbufferseg);\r
        }\r
-}*/\r
+}//*/\r
 \r
 //===========================================================================\r
 \r
@@ -2068,7 +2071,7 @@ void CA_SetAllPurge (void)
 //\r
 // free cursor sprite and background save\r
 //\r
-       VW_FreeCursor ();\r
+       //VW_FreeCursor ();\r
 \r
 //\r
 // free map headers and map planes\r