X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=blobdiff_plain;f=src%2Flib%2F16_ca.c;h=8dd2da0af0c5d8b017a6074f74501c548111a8c3;hp=87db2377e2910f881b031189d54ee755503f98a1;hb=28b1be191222717943878f024cddac30b026318e;hpb=ded380e7aab3ba7460e1f756b576722e996d939a

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 87db2377..8dd2da0a 100755
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -205,13 +205,13 @@ void CA_CloseDebug(global_game_variables_t *gvar)
 =
 ============================
 */
-/*++++
-void CAL_GetGrChunkLength (int chunk)
+
+void CAL_GetGrChunkLength (int chunk,global_game_variables_t *gvar)
 {
 	lseek(gvar->ca.file.grhandle,GRFILEPOS(chunk),SEEK_SET);
 	read(gvar->ca.file.grhandle,&gvar->ca.chunkexplen,sizeof(gvar->ca.chunkexplen));
 	gvar->ca.chunkcomplen = GRFILEPOS(chunk+1)-GRFILEPOS(chunk)-4;
-}*/
+}
 
 
 /*
@@ -1036,8 +1036,8 @@ dinorm:
 =
 ======================
 */
-////++++TODO: enable!
-/*void CAL_SetupGrFile (global_game_variables_t *gvar)
+
+void CAL_SetupGrFile (global_game_variables_t *gvar)
 {
 	char fname[13];
 	int handle;
@@ -1100,11 +1100,11 @@ dinorm:
 // load the pic and sprite headers into the arrays in the data segment
 //
 #if NUMPICS>0
-	MM_GetPtr(MEMPTR pictable,NUMPICS*sizeof(pictabletype),gvar);
-	CAL_GetGrChunkLength(STRUCTPIC);		// position file pointer
+	MM_GetPtr(MEMPTR 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);
-	CAL_HuffExpand (compseg, (byte far *)pictable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);
+	CAL_HuffExpand (compseg, (byte far *)gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);
 	MM_FreePtr(&compseg,gvar);
 #endif
 
@@ -1126,7 +1126,7 @@ dinorm:
 	MM_FreePtr(&compseg);
 #endif
 
-}*/
+}
 
 //==========================================================================