}\r
#endif\r
\r
+#define EXTENSION "hb1"\r
+\r
/*\r
=============================================================================\r
\r
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
MM_GetPtr (MEMPTRCONV gvar->ca.tinf,length,gvar);\r
CA_FarRead(handle, gvar->ca.tinf, length,gvar);\r
close(handle);\r
-//#else\r
+#else\r
\r
gvar->ca.tinf = (byte _seg *)FP_SEG(&maphead);\r
\r
CAL_SetupMapFile (gvar);\r
#endif\r
\r
- gvar->ca.camap.mapon = -1;\r
+ gvar->ca.mapon = -1;\r
gvar->ca.ca_levelbit = 1;\r
gvar->ca.ca_levelnum = 0;\r
\r
=\r
======================\r
*/\r
-/*++++ segments!\r
+\r
void CA_CacheMap (global_game_variables_t *gvar)\r
{\r
long pos,compressed;\r
//\r
// free up memory from last map\r
//\r
- if (gvar->ca.camap.mapon>-1 && gvar->ca.camap.mapheaderseg[gvar->ca.camap.mapon])\r
- MM_SetPurge (((memptr)gvar->ca.camap.mapheaderseg[(gvar->ca.camap.mapon)]), 3, gvar);\r
+ if (gvar->ca.mapon>-1 && gvar->ca.mapheaderseg[gvar->ca.mapon])\r
+ MM_SetPurge ((MEMPTRCONV gvar->ca.mapheaderseg[(gvar->ca.mapon)]), 3, gvar);\r
for (plane=0;plane<MAPPLANES;plane++)\r
- if (gvar->ca.camap.mapsegs[plane])\r
- MM_FreePtr ((memptr)gvar->ca.camap.mapsegs[plane], gvar);\r
+ if (gvar->ca.mapsegs[plane])\r
+ MM_FreePtr (MEMPTRCONV gvar->ca.mapsegs[plane], gvar);\r
\r
- gvar->ca.camap.mapon = gvar->ca.camap.mapnum;\r
+ gvar->ca.mapon = gvar->ca.mapnum;\r
\r
\r
//\r
// load map header\r
// The header will be cached if it is still around\r
//\r
-// if (!gvar->ca.camap.mapheaderseg[gvar->ca.camap.mapnum])\r
-// {\r
-// //pos = ((mapfiletype _seg *)tinf)->headeroffsets[mapnum];\r
-// //pos = ((_seg *)gvar->ca.camap.tinf)->headeroffsets[gvar->ca.camap.mapnum];\r
-// pos = ((memptr)gvar->ca.camap.tinf)->headeroffsets[gvar->ca.camap.mapnum];\r
-// if (pos<0) // $FFFFFFFF start is a sparse map\r
-// printf("CA_CacheMap: Tried to load a non existent map!");\r
+ if (!gvar->ca.mapheaderseg[gvar->ca.mapnum])\r
+ {\r
+ pos = ((mapfiletype _seg *)gvar->ca.tinf)->headeroffsets[gvar->ca.mapnum];\r
+ if (pos<0) // $FFFFFFFF start is a sparse map\r
+ Quit (gvar, "CA_CacheMap: Tried to load a non existent map!");\r
\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 (MEMPTRCONV mapheaderseg[mapnum], 0, &(gvar->mm));\r
+ MM_GetPtr(MEMPTRCONV gvar->ca.mapheaderseg[gvar->ca.mapnum],sizeof(maptype), gvar);\r
+ lseek(gvar->ca.file.maphandle,pos,SEEK_SET);\r
+#ifdef MAPHEADERLINKED\r
+//#if BUFFERSIZE < sizeof(maptype)\r
+//The general buffer size is too small!\r
+//#endif\r
+ //\r
+ // load in, then unhuffman to the destination\r
+ //\r
+ CA_FarRead (gvar->ca.file.maphandle,gvar->mm.bufferseg,((mapfiletype _seg *)gvar->ca.tinf)->headersize[gvar->ca.mapnum], gvar);\r
+ CAL_HuffExpand ((byte huge *)bufferseg,\r
+ (byte huge *)gvar->ca.mapheaderseg[gvar->ca.mapnum],sizeof(maptype),maphuffman, gvar);\r
+#else\r
+ CA_FarRead (gvar->ca.file.maphandle,(memptr)gvar->ca.mapheaderseg[gvar->ca.mapnum],sizeof(maptype), gvar);\r
+#endif\r
+ }\r
+ else\r
+ MM_SetPurge (MEMPTRCONV gvar->ca.mapheaderseg[gvar->ca.mapnum], 0, gvar);\r
\r
//\r
// load the planes in\r
// allways reloaded, never cached)\r
//\r
\r
- size = mapheaderseg[mapnum]->width * mapheaderseg[mapnum]->height * 2;\r
+ size = gvar->ca.mapheaderseg[gvar->ca.mapnum]->width * gvar->ca.mapheaderseg[gvar->ca.mapnum]->height * 2;\r
\r
for (plane = 0; plane<MAPPLANES; plane++)\r
{\r
- //pos = mapheaderseg[mapnum]->planestart[plane];\r
- //compressed = mapheaderseg[mapnum]->planelength[plane];\r
+ pos = gvar->ca.mapheaderseg[gvar->ca.mapnum]->planestart[plane];\r
+ compressed = gvar->ca.mapheaderseg[gvar->ca.mapnum]->planelength[plane];\r
\r
if (!compressed)\r
continue; // the plane is not used in this game\r
\r
- dest = MEMPTRCONV mapsegs[plane];\r
- MM_GetPtr(dest,size);\r
+ dest = MEMPTRCONV gvar->ca.mapsegs[plane];\r
+ MM_GetPtr(dest,size, gvar);\r
\r
- lseek(maphandle,pos,SEEK_SET);\r
+ lseek(gvar->ca.file.maphandle,pos,SEEK_SET);\r
if (compressed<=BUFFERSIZE)\r
- source = bufferseg;\r
+ source = gvar->mm.bufferseg;\r
else\r
{\r
- MM_GetPtr(&bigbufferseg,compressed);\r
- MM_SetLock (&bigbufferseg,true);\r
+ MM_GetPtr(&bigbufferseg,compressed, gvar);\r
+ MM_SetLock (&bigbufferseg,true, gvar);\r
source = bigbufferseg;\r
}\r
\r
- CA_FarRead(maphandle,(byte far *)source,compressed);\r
+ CA_FarRead(gvar->ca.file.maphandle,(byte far *)source,compressed, gvar);\r
#ifdef MAPHEADERLINKED\r
//\r
// unhuffman, then unRLEW\r
//\r
expanded = *source;\r
source++;\r
- MM_GetPtr (&buffer2seg,expanded);\r
+ MM_GetPtr (&buffer2seg,expanded, gvar);\r
CAL_CarmackExpand (source, (unsigned far *)buffer2seg,expanded);\r
CA_RLEWexpand (((unsigned far *)buffer2seg)+1,*dest,size,\r
((mapfiletype _seg *)tinf)->RLEWtag);\r
// unRLEW, skipping expanded length\r
//\r
CA_RLEWexpand (source+1, *dest,size,\r
- ((mapfiletype _seg *)tinf)->RLEWtag);\r
+ ((mapfiletype _seg *)gvar->ca.tinf)->RLEWtag);\r
#endif\r
\r
if (compressed>BUFFERSIZE)\r
- MM_FreePtr(&bigbufferseg);\r
+ MM_FreePtr(&bigbufferseg, gvar);\r
}\r
-}//*/\r
+}\r
\r
//===========================================================================\r
\r
//\r
// free map headers and map planes\r
//\r
-// for (i=0;i<NUMMAPS;i++)\r
-// if (gvar->ca.camap.mapheaderseg[i])\r
-// MM_SetPurge (gvar->ca.camap.mapheaderseg[i],3, gvar);\r
+ for (i=0;i<NUMMAPS;i++)\r
+ if (gvar->ca.mapheaderseg[i])\r
+ MM_SetPurge (MEMPTRCONV gvar->ca.mapheaderseg[i],3, gvar);\r
\r
for (i=0;i<3;i++)\r
if (gvar->ca.mapsegs[i])\r
- MM_FreePtr ((memptr *)&gvar->ca.mapsegs[i], gvar);\r
+ MM_FreePtr (MEMPTRCONV gvar->ca.mapsegs[i], gvar);\r
\r
//\r
// free sounds\r
//\r
for (i=0;i<NUMSNDCHUNKS;i++)\r
if (gvar->ca.audiosegs[i])\r
- MM_SetPurge ((memptr *)&gvar->ca.audiosegs[i],3, gvar);\r
+ MM_SetPurge (MEMPTRCONV gvar->ca.audiosegs[i],3, gvar);\r
\r
//\r
// free graphics\r
= CA_CacheMarks\r
=\r
======================\r
-*//*++++\r
+*/\r
#define MAXEMPTYREAD 1024\r
-\r
+/*++++ segments\r
void CAL_CacheMarks (char *title, global_game_variables_t *gvar)\r
{\r
boolean dialog;\r
\r
// MDM begin - (GAMERS EDGE)\r
//\r
-// if (!FindFile("EGAGRAPH.16",NULL,2))\r
-// Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");\r
+//???? if (!FindFile("EGAGRAPH.16",NULL,2))\r
+//???? Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");\r
//\r
// MDM end\r
\r
//\r
if (dialog && finishcachebox)\r
finishcachebox();\r
-}*/\r
+}//*/\r
\r
void CA_CannotOpen(char *string, global_game_variables_t *gvar)\r
{\r
projects / 16.git / blobdiff