X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_ca.c;h=ce406dd50ebf6b08b481bc2a209e67e6a6fab370;hb=63a6c9058ef704a718e623a317a7626b509cdfd1;hp=3204865fa554010cd4006d63017000798ec669db;hpb=96992fdbb5f922729fde92dc43051fe082e0b47e;p=16.git

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 3204865f..ce406dd5 100755
--- 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
 	printf("CAL_SetupGrFile:\n");
 	printf("	gvar->ca.chunkcomplen size is %lu\n", gvar->ca.chunkcomplen);
-	MM_GetPtr(&compseg,gvar->ca.chunkcomplen,gvar);
-	IN_Ack(gvar);
+	MM_GetPtr(MEMPTRANDPERCONV compseg,gvar->ca.chunkcomplen,gvar);								IN_Ack(gvar);
 	CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen,gvar);
 	CAL_HuffExpand (compseg, (byte far *)gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);
-	MM_FreePtr(&compseg,gvar);
+	MM_FreePtr(MEMPTRANDPERCONV compseg,gvar);
 #endif
 
-#if NUMPICM>0
+#if 0
+	//NUMPICM>0
 	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);
 	CAL_HuffExpand (compseg, (byte far *)picmtable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);
 	MM_FreePtr(&compseg);
-#endif
+//#endif
 
-#if NUMSPRITES>0
+//#if NUMSPRITES>0
 	MM_GetPtr(MEMPTRCONV spritetable,NUMSPRITES*sizeof(spritetabletype));
 	CAL_GetGrChunkLength(STRUCTSPRITE);	// position file pointer
 	MM_GetPtr(&compseg,gvar->ca.chunkcomplen);
@@ -2284,9 +2284,9 @@ void	CAL_DialogFinish (void)
 = CA_CacheMarks
 =
 ======================
-*//*++++
+*/
 #define MAXEMPTYREAD	1024
-
+/*++++ segments
 void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
 {
 	boolean dialog;
@@ -2321,8 +2321,8 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
 
 // MDM begin - (GAMERS EDGE)
 //
-//	if (!FindFile("EGAGRAPH.16",NULL,2))
-//		Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");
+//????	if (!FindFile("EGAGRAPH.16",NULL,2))
+//????		Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");
 //
 // MDM end
 
@@ -2425,7 +2425,7 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
 //
 		if (dialog && finishcachebox)
 			finishcachebox();
-}*/
+}//*/
 
 void CA_CannotOpen(char *string, global_game_variables_t *gvar)
 {