16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / lib / 16_ca.c

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 87db2377e2910f881b031189d54ee755503f98a1..8dd2da0af0c5d8b017a6074f74501c548111a8c3 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -205,13 +205,13 @@ void CA_CloseDebug(global_game_variables_t *gvar)
 =\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
@@ -1036,8 +1036,8 @@ dinorm:
 =\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
@@ -1100,11 +1100,11 @@ dinorm:
 // 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(MEMPTR 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
@@ -1126,7 +1126,7 @@ dinorm:
        MM_FreePtr(&compseg);\r
 #endif\r
 \r
-}*/\r
+}\r
 \r
 //==========================================================================\r
 \r