X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=blobdiff_plain;f=src%2Flib%2F16_ca.c;h=64c6674a9be661d57e6ca73a14fa5b8b116c13d9;hp=8dd2da0af0c5d8b017a6074f74501c548111a8c3;hb=3bcd7fdc88a1ae0a536e7631b50719ae7b320d4b;hpb=256be2f6f35912701d3e3770e49e388f462a6acc

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