16_ca needs huge amounts of work and I should remember what needs to be done soon...

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

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 8dd2da0af0c5d8b017a6074f74501c548111a8c3..64c6674a9be661d57e6ca73a14fa5b8b116c13d9 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1041,7 +1041,9 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 {\r
        char fname[13];\r
        int handle;\r
+#if NUMPICS>0\r
        memptr compseg;\r
+#endif\r
 \r
 #ifdef GRHEADERLINKED\r
 \r
@@ -1069,7 +1071,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 //\r
 // load the data offsets from ???head.ext\r
 //\r
-       MM_GetPtr (MEMPTR gvar->ca.grstarts,(NUMCHUNKS+1)*FILEPOSSIZE, gvar);\r
+       MM_GetPtr (MEMPTRCONV gvar->ca.grstarts,(NUMCHUNKS+1)*FILEPOSSIZE, gvar);\r
 \r
        strcpy(fname,GHEADNAME);\r
        strcat(fname,EXTENSION);\r
@@ -1100,7 +1102,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 // load the pic and sprite headers into the arrays in the data segment\r
 //\r
 #if NUMPICS>0\r
-       MM_GetPtr(MEMPTR gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar);\r
+       MM_GetPtr(MEMPTRCONV gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar);\r
        CAL_GetGrChunkLength(STRUCTPIC,gvar);           // position file pointer\r
        MM_GetPtr(&compseg,gvar->ca.chunkcomplen, gvar);\r
        CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen,gvar);\r
@@ -1109,7 +1111,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 #endif\r
 \r
 #if NUMPICM>0\r
-       MM_GetPtr(MEMPTR picmtable,NUMPICM*sizeof(pictabletype));\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
@@ -1118,7 +1120,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 #endif\r
 \r
 #if NUMSPRITES>0\r
-       MM_GetPtr(MEMPTR spritetable,NUMSPRITES*sizeof(spritetabletype));\r
+       MM_GetPtr(MEMPTRCONV spritetable,NUMSPRITES*sizeof(spritetabletype));\r
        CAL_GetGrChunkLength(STRUCTSPRITE);     // position file pointer\r
        MM_GetPtr(&compseg,gvar->ca.chunkcomplen);\r
        CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen);\r
@@ -1154,7 +1156,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit (gvar, "Can't open maphead.mph");\r
        length = filelength(handle);\r
-       MM_GetPtr (MEMPTR gvar->ca.tinf,length,gvar);\r
+       MM_GetPtr (MEMPTRCONV gvar->ca.tinf,length,gvar);\r
        CA_FarRead(handle, gvar->ca.tinf, length,gvar);\r
        close(handle);\r
 //#else\r
@@ -1205,7 +1207,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit (gvar, "Can't open AUDIOHED.16""!");\r
        length = filelength(handle);\r
-       MM_GetPtr (MEMPTR audiostarts,length);\r
+       MM_GetPtr (MEMPTRCONV audiostarts,length);\r
        CA_FarRead(handle, (byte far *)audiostarts, length);\r
        close(handle);\r
 #else\r
@@ -1329,7 +1331,7 @@ void CA_CacheAudioChunk (int chunk)
 \r
        if (audiosegs[chunk])\r
        {\r
-               MM_SetPurge (MEMPTR audiosegs[chunk],0);\r
+               MM_SetPurge (MEMPTRCONV audiosegs[chunk],0);\r
                return;                                                 // allready in memory\r
        }\r
 \r
@@ -1351,7 +1353,7 @@ void CA_CacheAudioChunk (int chunk)
 \r
 #ifndef AUDIOHEADERLINKED\r
 \r
-       MM_GetPtr (MEMPTR audiosegs[chunk],compressed);\r
+       MM_GetPtr (MEMPTRCONV audiosegs[chunk],compressed);\r
        if (mmerror)\r
                return;\r
 \r
@@ -1376,7 +1378,7 @@ void CA_CacheAudioChunk (int chunk)
 \r
        expanded = *(long far *)source;\r
        source += 4;                    // skip over length\r
-       MM_GetPtr (MEMPTR audiosegs[chunk],expanded);\r
+       MM_GetPtr (MEMPTRCONV audiosegs[chunk],expanded);\r
        if (mmerror)\r
                goto done;\r
        CAL_HuffExpand (source,audiosegs[chunk],expanded,audiohuffman);\r
@@ -1417,7 +1419,7 @@ void CA_LoadAllSounds (void)
 \r
        for (i=0;i<NUMSOUNDS;i++,start++)\r
                if (audiosegs[start])\r
-                       MM_SetPurge (MEMPTR audiosegs[start],3);                // make purgable\r
+                       MM_SetPurge (MEMPTRCONV audiosegs[start],3);            // make purgable\r
 \r
 cachein:\r
 \r
@@ -1945,12 +1947,12 @@ void CA_CacheMap (global_game_variables_t *gvar)
 //             if (pos<0)                                              // $FFFFFFFF start is a sparse map\r
 //               printf("CA_CacheMap: Tried to load a non existent map!");\r
 \r
-//             MM_GetPtr(MEMPTR gvar->ca.camapheaderseg[mapnum],sizeof(maptype));\r
+//             MM_GetPtr(MEMPTRCONV gvar->ca.camapheaderseg[mapnum],sizeof(maptype));\r
 //             lseek(maphandle,pos,SEEK_SET);\r
 //             CA_FarRead (maphandle,(memptr)mapheaderseg[mapnum],sizeof(maptype));\r
 //     }\r
 //     else\r
-//             MM_SetPurge (MEMPTR mapheaderseg[mapnum], 0, &(gvar->mm));\r
+//             MM_SetPurge (MEMPTRCONV mapheaderseg[mapnum], 0, &(gvar->mm));\r
 \r
 //\r
 // load the planes in\r
@@ -1968,7 +1970,7 @@ void CA_CacheMap (global_game_variables_t *gvar)
                if (!compressed)\r
                        continue;               // the plane is not used in this game\r
 \r
-               dest = MEMPTR mapsegs[plane];\r
+               dest = MEMPTRCONV mapsegs[plane];\r
                MM_GetPtr(dest,size);\r
 \r
                lseek(maphandle,pos,SEEK_SET);\r