bloody typedefstruct merging is going to be tricky

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 537e8ba8807c7b83a17fd50d07e5aa981120f46c..3f3951736fc9eb5f05915159a84d891a5d728a06 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1839,7 +1839,7 @@ void CA_CacheGrChunk (int chunk)
 =\r
 ======================\r
 */\r
-/*++++ fuckin segments!\r
+/*++++ segments!\r
 void CA_CacheMap (global_game_variables_t *gvar)\r
 {\r
        long    pos,compressed;\r
@@ -1857,10 +1857,7 @@ void CA_CacheMap (global_game_variables_t *gvar)
 // 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\r
-                                                                                       [(gvar->ca.map.mapon)]),\r
-\r
- 3, &(gvar->mm));\r
+               MM_SetPurge (&((memptr)gvar->ca.map.mapheaderseg[(gvar->ca.map.mapon)]), 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], &(gvar->mm));\r