=\r
============================\r
*/\r
-/*++++\r
-void CAL_GetGrChunkLength (int chunk)\r
+\r
+void CAL_GetGrChunkLength (int chunk,global_game_variables_t *gvar)\r
{\r
lseek(gvar->ca.file.grhandle,GRFILEPOS(chunk),SEEK_SET);\r
read(gvar->ca.file.grhandle,&gvar->ca.chunkexplen,sizeof(gvar->ca.chunkexplen));\r
gvar->ca.chunkcomplen = GRFILEPOS(chunk+1)-GRFILEPOS(chunk)-4;\r
-}*/\r
+}\r
\r
\r
/*\r
=\r
======================\r
*/\r
-////++++TODO: enable!\r
-/*void CAL_SetupGrFile (global_game_variables_t *gvar)\r
+\r
+void CAL_SetupGrFile (global_game_variables_t *gvar)\r
{\r
char fname[13];\r
int handle;\r
+#if NUMPICS>0\r
memptr compseg;\r
+#endif\r
\r
#ifdef GRHEADERLINKED\r
\r
//\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
// load the pic and sprite headers into the arrays in the data segment\r
//\r
#if NUMPICS>0\r
- MM_GetPtr(MEMPTR pictable,NUMPICS*sizeof(pictabletype),gvar);\r
- CAL_GetGrChunkLength(STRUCTPIC); // position file pointer\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
- CAL_HuffExpand (compseg, (byte far *)pictable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);\r
+ CAL_HuffExpand (compseg, (byte far *)gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);\r
MM_FreePtr(&compseg,gvar);\r
#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
#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
MM_FreePtr(&compseg);\r
#endif\r
\r
-}*/\r
+}\r
\r
//==========================================================================\r
\r
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
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
\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
\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
\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
\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
// 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
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