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 537e8ba8807c7b83a17fd50d07e5aa981120f46c..0b22ed14de172a390aefc526bd33b4f7e88c5caf 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1111,7 +1111,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 // #ifndef MAPHEADERLINKED\r
 //     if ((handle = open("MAPHEAD."EXT,\r
 //              O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-//             Quit ("Can't open MAPHEAD."EXT"!");\r
+//             printf("Can't open MAPHEAD."EXT"!");\r
 //     length = filelength(handle);\r
 //     MM_GetPtr (&(memptr)tinf,length);\r
 //     CA_FarRead(handle, tinf, length);\r
@@ -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