--0000-- UNTESTED --0000--

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

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 1d9b7f0be2b3b5b35fb18e77953ad1e841a622d7..6580e2393065732cb8ddcaa170eb63e4fa77d6f3 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1088,23 +1088,23 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
        CAL_GetGrChunkLength(STRUCTPIC,gvar);           // position file pointer\r
        printf("CAL_SetupGrFile:\n");\r
        printf("        gvar->ca.chunkcomplen size is %lu\n", gvar->ca.chunkcomplen);\r
-       MM_GetPtr(&compseg,gvar->ca.chunkcomplen,gvar);\r
-       IN_Ack(gvar);\r
+       MM_GetPtr(MEMPTRANDPERCONV compseg,gvar->ca.chunkcomplen,gvar);                                                         IN_Ack(gvar);\r
        CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen,gvar);\r
        CAL_HuffExpand (compseg, (byte far *)gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);\r
-       MM_FreePtr(&compseg,gvar);\r
+       MM_FreePtr(MEMPTRANDPERCONV compseg,gvar);\r
 #endif\r
 \r
-#if NUMPICM>0\r
+#if 0\r
+       //NUMPICM>0\r
        MM_GetPtr(MEMPTRCONV picmtable,NUMPICM*sizeof(pictabletype));\r
        CAL_GetGrChunkLength(STRUCTPICM);               // position file pointer\r
        MM_GetPtr(&compseg,gvar->ca.chunkcomplen);\r
        CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen);\r
        CAL_HuffExpand (compseg, (byte far *)picmtable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);\r
        MM_FreePtr(&compseg);\r
-#endif\r
+//#endif\r
 \r
-#if NUMSPRITES>0\r
+//#if NUMSPRITES>0\r
        MM_GetPtr(MEMPTRCONV spritetable,NUMSPRITES*sizeof(spritetabletype));\r
        CAL_GetGrChunkLength(STRUCTSPRITE);     // position file pointer\r
        MM_GetPtr(&compseg,gvar->ca.chunkcomplen);\r
@@ -1241,6 +1241,7 @@ void CA_Startup(global_game_variables_t *gvar)
 #endif\r
 #endif//profile\r
 \r
+#ifdef SHOWMEMINFO\r
 #ifdef __BORLANDC__\r
        unlink("meminfo.16b");\r
        gvar->handle.showmemhandle = open("meminfo.16b", O_CREAT | O_WRONLY | O_TEXT);\r
@@ -1249,6 +1250,7 @@ void CA_Startup(global_game_variables_t *gvar)
        unlink("meminfo.16w");\r
        gvar->handle.showmemhandle = open("meminfo.16w", O_CREAT | O_WRONLY | O_TEXT);\r
 #endif\r
+#endif\r
 \r
 \r
 #ifndef NOMAPS\r
@@ -1288,7 +1290,9 @@ void CA_Shutdown(global_game_variables_t *gvar)
 #ifdef PROFILE\r
        close(gvar->handle.profilehandle);\r
 #endif\r
+#ifdef SHOWMEMINFO\r
        close(gvar->handle.showmemhandle);\r
+#endif\r
 \r
        close(gvar->ca.file.maphandle);\r
        close(gvar->ca.file.grhandle);\r