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

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

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 6fe2c646bb754b1be7970b235f8b194676a7433b..f45195d698b9a93d9336987d3ed69157b18a4a1e 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -362,6 +362,11 @@ typedef struct
 #define NUMCHUNKS      416     //keen\r
 #define MAXSCANLINES   240                     // size of ylookup table\r
 \r
+typedef struct\r
+{\r
+       int width,height;\r
+} pictabletype;\r
+\r
 //video\r
 typedef struct\r
 {\r
@@ -426,6 +431,7 @@ typedef struct
        word            bordercolor;\r
        boolean fastpalette;\r
        byte            far     palette1[256][3],far palette2[256][3];\r
+       pictabletype    _seg *pictable;\r
 } video_t;\r
 \r
 //from scroll16\r
@@ -645,7 +651,7 @@ typedef struct
 //==========================================================================\r
 \r
 #define NOMAPS\r
-#define NOGRAPHICS\r
+//#define NOGRAPHICS\r
 #define NOAUDIO\r
 \r
 #define MAPHEADERLINKED\r
@@ -654,14 +660,15 @@ typedef struct
 \r
 #define NUMMAPS                4//39\r
 #define NUMSNDCHUNKS           4//3\r
-#define NUMPICS                132//wolf3d wl6\r
+//#define NUMPICS              132//wolf3d wl6\r
 \r
 #define STRUCTPIC      0\r
 \r
 \r
-#define GDICTNAME      "vgadict."\r
-#define GHEADNAME      "vgahead."\r
-#define GFILENAME      "vgagraph."\r
+#define DATADIR                "data/"\r
+#define GDICTNAME      DATADIR"vgadict."\r
+#define GHEADNAME      DATADIR"vgahead."\r
+#define GFILENAME      DATADIR"vgagraph."\r
 #define EXTENSION      "hb1"\r
 \r
 \r