=============================================================================\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
boolean flag;\r
//dword fat=0;\r
//word segm=0;\r
- //if(mm->EMSVer<0x40)\r
+ if(mm->EMSVer<0x40)\r
if(length>0xfffflu)\r
{\r
printf("File is a fat bakapee\n");\r
//segm=(length%0xfffflu)-1;\r
//fat=segm*0xfffflu;\r
//length-=fat;\r
-// printf("CA_FarRead doesn't support 64K reads yet!\n");\r
+ printf("CA_FarRead doesn't support 64K reads yet!\n");\r
return 0;//TODO: EXPAND!!!\r
}\r
\r
boolean flag;\r
//dword fat=0;\r
//word segm=0;\r
- //if(mm->EMSVer<0x40)\r
+ if(mm->EMSVer<0x40)\r
if(length>0xfffflu)\r
{\r
printf("File is a fat bakapee\n");\r
//segm=(length%0xfffflu)-1;\r
//fat=segm*0xfffflu;\r
//length-=fat;\r
-// printf("CA_FarRead doesn't support 64K reads yet!\n");\r
+ printf("CA_FarRead doesn't support 64K reads yet!\n");\r
return 0;\r
}\r
\r
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
=\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
=\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
// 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
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
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