ca_t added

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

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index f5893d8110a0ffd572081ede1dfc1aff4dcb66ca..bd2f9bbd164a45b36e64df1558874ca86d0d3943 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -46,10 +46,10 @@ loaded into the data segment
 =============================================================================\r
 */\r
 \r
-typedef struct\r
+/*typedef struct\r
 {\r
   unsigned bit0,bit1;  // 0-255 is a character, > is a pointer to a node\r
-} huffnode;\r
+} huffnode;*/  //moved to src/lib/typdefst.h\r
 \r
 \r
 /*typedef struct\r
@@ -1713,7 +1713,7 @@ void CA_CacheGrChunk (int chunk)
        byte    far *source;\r
        int             next;\r
 \r
-       grneeded[chunk] |= ca_levelbit;         // make sure it doesn't get removed\r
+       gvar->video.grneeded[chunk] |= ca_levelbit;             // make sure it doesn't get removed\r
        if (grsegs[chunk])\r
        {\r
                MM_SetPurge (&grsegs[chunk],0);\r
@@ -1937,15 +1937,13 @@ void CA_DownLevel (void)
 =\r
 ======================\r
 */\r
-/*\r
-void CA_ClearMarks (void)\r
+void CA_ClearMarks (global_game_variables_t *gvar)\r
 {\r
        int i;\r
 \r
        for (i=0;i<NUMCHUNKS;i++)\r
-               grneeded[i]&=~ca_levelbit;\r
+               gvar->video.grneeded[i]&=~gvar->ca.ca_levelbit;\r
 }\r
-*/\r
 \r
 //===========================================================================\r
 \r
@@ -1958,14 +1956,12 @@ void CA_ClearMarks (void)
 =\r
 ======================\r
 */\r
-/*\r
-void CA_ClearAllMarks (void)\r
+void CA_ClearAllMarks (global_game_variables_t *gvar)\r
 {\r
-       _fmemset (grneeded,0,sizeof(grneeded));\r
-       ca_levelbit = 1;\r
-       ca_levelnum = 0;\r
+       _fmemset (gvar->video.grneeded,0,sizeof(gvar->video.grneeded));\r
+       gvar->ca.ca_levelbit = 1;\r
+       gvar->ca.ca_levelnum = 0;\r
 }\r
-*/\r
 \r
 //===========================================================================\r
 \r
@@ -2192,7 +2188,7 @@ void CA_CacheMarks (char *title)
 // go through and make everything not needed purgable\r
 //\r
        for (i=0;i<NUMCHUNKS;i++)\r
-               if (grneeded[i]&ca_levelbit)\r
+               if (gvar->video.grneeded[i]&ca_levelbit)\r
                {\r
                        if (grsegs[i])                                  // its allready in memory, make\r
                                MM_SetPurge(&grsegs[i],0);      // sure it stays there!\r
@@ -2231,7 +2227,7 @@ void CA_CacheMarks (char *title)
        bufferstart = bufferend = 0;            // nothing good in buffer now\r
 \r
        for (i=0;i<NUMCHUNKS;i++)\r
-               if ( (grneeded[i]&ca_levelbit) && !grsegs[i])\r
+               if ( (gvar->video.grneeded[i]&ca_levelbit) && !grsegs[i])\r
                {\r
 //\r
 // update thermometer\r
@@ -2265,7 +2261,7 @@ void CA_CacheMarks (char *title)
                                        while ( next < NUMCHUNKS )\r
                                        {\r
                                                while (next < NUMCHUNKS &&\r
-                                               !(grneeded[next]&ca_levelbit && !grsegs[next]))\r
+                                               !(gvar->video.grneeded[next]&ca_levelbit && !grsegs[next]))\r
                                                        next++;\r
                                                if (next == NUMCHUNKS)\r
                                                        continue;\r