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

diff --git a/data/genvga.sh b/data/genvga.sh
new file mode 100755 (executable)
index 0000000..e81ca21
--- /dev/null
+++ b/data/genvga.sh
@@ -0,0 +1,3 @@
+dd bs=1 count=275774 </dev/urandom >vgagraph.hb1
+dd bs=1 count=450 </dev/urandom >vgahead.hb1
+dd bs=450 count=1 </dev/urandom >/dos/z/16/data/vgadict.hb1

diff --git a/data/vgadict.hb1 b/data/vgadict.hb1
new file mode 100755 (executable)
index 0000000..fcfecfe
--- /dev/null
+++ b/data/vgadict.hb1
@@ -0,0 +1 @@
+\16ÍëåÝÿ*a\17Ü\94³É\fÃ\1a4e!q\87\7fÒ\15}ht}Ò7\1aÓÙ§;äî\ 6\86\97ã\86QìÃZó\1a«rñþäß\94¾}¦\vKͳ\97\9cºØô²Ï\r\18Ï;ª \1d"\8d\ 2¢°·\99eÅr½,Ëáí\ fàFk¬6\88©gi\85Î\1aA¹\7f\80\°GÐ5ã\7f©+\9fÐ¥¡      ¦ï¯\1d\91«üd}þ^\83\11QËÖ8\16ïV<ØXnÛ\88yÓÐ6\ 3\83¨\ 6PÆþ\ 6\9e\b;\8fÉ+ë¢Ì ¬iã\84\86<§"\ 1¦L\92i\99N¼¶¡6\1d¾L\aøu°\86B\9fÜ}\17\a¾n    p\16e"\94L\ 4[\90\;\ 2Ï\eÃ\8fþ\1f_'\8cI?\88\8fú²`dÊ\7fc\95µ\ 5ãÍÇ+x½\91+\94_ÑÇÌÜø5?\9bì}Æ·FÛh(\Õk\ f+À:ÏY瘝äøU\99B4¡­;º\8e^¨\1fÖö­ÍdºÇ;ôó\93~¢+mg~nZHÖ\8eɯ?\f¯\8aÔ¨òè\88t\19\16¶\9b¾vÐË¡\86\7f[\1d\ 6Þ\98Æ\v1\9e4·ú]\fj\94"¹(Iõ=\999´ÇYç\19OCÛäA\91\fУ#±\85/¬±F'̺½·\8crü\83NÌï~\9b\9bp\ 4\ eV)PÉ0\9aH\ 11\8bû\ fáá\ 1Î\\ 5e£\8cË\15½#{\15s¶\9b¤Û_Ñ5Y¨V0,_<äy\85º\14v
\ No newline at end of file

diff --git a/data/vgagraph.hb1 b/data/vgagraph.hb1
new file mode 100755 (executable)
index 0000000..2ba5068
Binary files /dev/null and b/data/vgagraph.hb1 differ

diff --git a/data/vgahead.hb1 b/data/vgahead.hb1
new file mode 100755 (executable)
index 0000000..4b82e5d
Binary files /dev/null and b/data/vgahead.hb1 differ

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index fad1a012b194cd55f552c456b26ead76e0443fd9..87db2377e2910f881b031189d54ee755503f98a1 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -98,16 +98,17 @@ extern      byte    EGAdict;
 extern byte    far     maphead;\r
 extern byte    mapdict;\r
 extern byte    far     audiohead;\r
 extern byte    far     maphead;\r
 extern byte    mapdict;\r
 extern byte    far     audiohead;\r

-extern byte    audiodict;\r
+extern byte    audiodict;*/\r

 \r
 \r

+void CA_CannotOpen(char *string, global_game_variables_t *gvar);\r

 \r
 \r

-long           _seg *grstarts; // array of offsets in egagraph, -1 for sparse\r
+/*long         _seg *grstarts; // array of offsets in egagraph, -1 for sparse\r

 long           _seg *audiostarts;      // array of offsets in audio / audiot\r
 \r
 #ifdef GRHEADERLINKED\r
 long           _seg *audiostarts;      // array of offsets in audio / audiot\r
 \r
 #ifdef GRHEADERLINKED\r

-huffnode       *grhuffman;\r
+huffnode       *gvar->ca.grhuffman;\r

 #else\r
 #else\r

-huffnode       grhuffman[255];\r
+huffnode       gvar->ca.grhuffman[255];\r

 #endif\r
 \r
 #ifdef AUDIOHEADERLINKED\r
 #endif\r
 \r
 #ifdef AUDIOHEADERLINKED\r


@@ -121,7 +122,7 @@ int                 grhandle;               // handle to EGAGRAPH
 int                    maphandle;              // handle to MAPTEMP / GAMEMAPS\r
 int                    audiohandle;    // handle to AUDIOT / AUDIO\r
 \r
 int                    maphandle;              // handle to MAPTEMP / GAMEMAPS\r
 int                    audiohandle;    // handle to AUDIOT / AUDIO\r
 \r

-long           chunkcomplen,chunkexplen;\r
+long           c hunkcomplen,c hunkexplen;\r

 \r
 SDMode         oldsoundmode;\r
 \r
 \r
 SDMode         oldsoundmode;\r
 \r


@@ -130,7 +131,8 @@ SDMode              oldsoundmode;
 void   CAL_DialogDraw (char *title,unsigned numcache);\r
 void   CAL_DialogUpdate (void);\r
 void   CAL_DialogFinish (void);*/\r
 void   CAL_DialogDraw (char *title,unsigned numcache);\r
 void   CAL_DialogUpdate (void);\r
 void   CAL_DialogFinish (void);*/\r

-//void CAL_CarmackExpand (unsigned far *source, unsigned far *dest,unsigned length);\r
+void   CAL_CarmackExpand (unsigned far *source, unsigned far *dest,\r
+               unsigned length);\r

 \r
 \r
 #ifdef THREEBYTEGRSTARTS\r
 \r
 \r
 #ifdef THREEBYTEGRSTARTS\r


@@ -206,9 +208,9 @@ void CA_CloseDebug(global_game_variables_t *gvar)
 /*++++\r
 void CAL_GetGrChunkLength (int chunk)\r
 {\r
 /*++++\r
 void CAL_GetGrChunkLength (int chunk)\r
 {\r

-       lseek(grhandle,GRFILEPOS(chunk),SEEK_SET);\r
-       read(grhandle,&chunkexplen,sizeof(chunkexplen));\r
-       chunkcomplen = GRFILEPOS(chunk+1)-GRFILEPOS(chunk)-4;\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
 \r


@@ -1034,24 +1036,19 @@ dinorm:
 =\r
 ======================\r
 */\r
 =\r
 ======================\r
 */\r

-////++++ enable!\r
-/*void CAL_SetupGrFile (void)\r
+////++++TODO: enable!\r
+/*void CAL_SetupGrFile (global_game_variables_t *gvar)\r

 {\r
 {\r

+       char fname[13];\r

        int handle;\r
        memptr compseg;\r
 \r
 #ifdef GRHEADERLINKED\r
 \r
        int handle;\r
        memptr compseg;\r
 \r
 #ifdef GRHEADERLINKED\r
 \r

-#if GRMODE == EGAGR\r
-       grhuffman = (huffnode *)&EGAdict;\r
-       grstarts = (long _seg *)FP_SEG(&EGAhead);\r
-#endif\r
-#if GRMODE == CGAGR\r
-       grhuffman = (huffnode *)&CGAdict;\r
-       grstarts = (long _seg *)FP_SEG(&CGAhead);\r
-#endif\r
+       gvar->ca.grhuffman = (huffnode *)&VGAdict;\r
+       grstarts = (long _seg *)FP_SEG(&VGAhead);\r

 \r
 \r

-       CAL_OptimizeNodes (grhuffman);\r
+       CAL_OptimizeNodes (gvar->ca.grhuffman);\r

 \r
 #else\r
 \r
 \r
 #else\r
 \r


@@ -1059,23 +1056,29 @@ dinorm:
 // load ???dict.ext (huffman dictionary for graphics files)\r
 //\r
 \r
 // load ???dict.ext (huffman dictionary for graphics files)\r
 //\r
 \r

-       if ((handle = open(GREXT"DICT."EXT,\r
+       strcpy(fname,GDICTNAME);\r
+       strcat(fname,EXTENSION);\r
+\r
+       if ((handle = open(fname,\r

                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r

-               Quit (gvar, "Can't open "GREXT"DICT."EXT"!");\r
+               CA_CannotOpen(fname,gvar);\r

 \r
 \r

-       read(handle, &grhuffman, sizeof(grhuffman));\r
+       read(handle, &gvar->ca.grhuffman, sizeof(gvar->ca.grhuffman));\r

        close(handle);\r
        close(handle);\r

-       CAL_OptimizeNodes (grhuffman);\r
+       CAL_OptimizeNodes (gvar->ca.grhuffman);\r

 //\r
 // load the data offsets from ???head.ext\r
 //\r
 //\r
 // load the data offsets from ???head.ext\r
 //\r

-       MM_GetPtr (MEMPTR grstarts,(NUMCHUNKS+1)*FILEPOSSIZE);\r
+       MM_GetPtr (MEMPTR gvar->ca.grstarts,(NUMCHUNKS+1)*FILEPOSSIZE, gvar);\r
+\r
+       strcpy(fname,GHEADNAME);\r
+       strcat(fname,EXTENSION);\r

 \r
 \r

-       if ((handle = open(GREXT"HEAD."EXT,\r
+       if ((handle = open(fname,\r

                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r

-               Quit (gvar, "Can't open "GREXT"HEAD."EXT"!");\r
+               CA_CannotOpen(fname,gvar);\r

 \r
 \r

-       CA_FarRead(handle, (memptr)grstarts, (NUMCHUNKS+1)*FILEPOSSIZE);\r
+       CA_FarRead(handle, (memptr)gvar->ca.grstarts, (NUMCHUNKS+1)*FILEPOSSIZE, gvar);\r

 \r
        close(handle);\r
 \r
 \r
        close(handle);\r
 \r


@@ -1085,38 +1088,41 @@ dinorm:
 //\r
 // Open the graphics file, leaving it open until the game is finished\r
 //\r
 //\r
 // Open the graphics file, leaving it open until the game is finished\r
 //\r

-       grhandle = open(GREXT"GRAPH."EXT, O_RDONLY | O_BINARY);\r
-       if (grhandle == -1)\r
-               Quit (gvar, "Cannot open "GREXT"GRAPH."EXT"!");\r
+       strcpy(fname,GFILENAME);\r
+       strcat(fname,EXTENSION);\r
+\r
+       gvar->ca.file.grhandle = open(fname, O_RDONLY | O_BINARY);\r
+       if (gvar->ca.file.grhandle == -1)\r
+               CA_CannotOpen(fname,gvar);\r

 \r
 \r
 //\r
 // load the pic and sprite headers into the arrays in the data segment\r
 //\r
 #if NUMPICS>0\r
 \r
 \r
 //\r
 // 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));\r
+       MM_GetPtr(MEMPTR pictable,NUMPICS*sizeof(pictabletype),gvar);\r

        CAL_GetGrChunkLength(STRUCTPIC);                // position file pointer\r
        CAL_GetGrChunkLength(STRUCTPIC);                // position file pointer\r

-       MM_GetPtr(&compseg,chunkcomplen);\r
-       CA_FarRead (grhandle,compseg,chunkcomplen);\r
-       CAL_HuffExpand (compseg, (byte far *)pictable,NUMPICS*sizeof(pictabletype),grhuffman);\r
-       MM_FreePtr(&compseg);\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
+       MM_FreePtr(&compseg,gvar);\r

 #endif\r
 \r
 #if NUMPICM>0\r
        MM_GetPtr(MEMPTR picmtable,NUMPICM*sizeof(pictabletype));\r
        CAL_GetGrChunkLength(STRUCTPICM);               // position file pointer\r
 #endif\r
 \r
 #if NUMPICM>0\r
        MM_GetPtr(MEMPTR picmtable,NUMPICM*sizeof(pictabletype));\r
        CAL_GetGrChunkLength(STRUCTPICM);               // position file pointer\r

-       MM_GetPtr(&compseg,chunkcomplen);\r
-       CA_FarRead (grhandle,compseg,chunkcomplen);\r
-       CAL_HuffExpand (compseg, (byte far *)picmtable,NUMPICS*sizeof(pictabletype),grhuffman);\r
+       MM_GetPtr(&compseg,gvar->ca.chunkcomplen);\r
+       CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen);\r
+       CAL_HuffExpand (compseg, (byte far *)picmtable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);\r

        MM_FreePtr(&compseg);\r
 #endif\r
 \r
 #if NUMSPRITES>0\r
        MM_GetPtr(MEMPTR spritetable,NUMSPRITES*sizeof(spritetabletype));\r
        CAL_GetGrChunkLength(STRUCTSPRITE);     // position file pointer\r
        MM_FreePtr(&compseg);\r
 #endif\r
 \r
 #if NUMSPRITES>0\r
        MM_GetPtr(MEMPTR spritetable,NUMSPRITES*sizeof(spritetabletype));\r
        CAL_GetGrChunkLength(STRUCTSPRITE);     // position file pointer\r

-       MM_GetPtr(&compseg,chunkcomplen);\r
-       CA_FarRead (grhandle,compseg,chunkcomplen);\r
-       CAL_HuffExpand (compseg, (byte far *)spritetable,NUMSPRITES*sizeof(spritetabletype),grhuffman);\r
+       MM_GetPtr(&compseg,gvar->ca.chunkcomplen);\r
+       CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen);\r
+       CAL_HuffExpand (compseg, (byte far *)spritetable,NUMSPRITES*sizeof(spritetabletype),gvar->ca.grhuffman);\r

        MM_FreePtr(&compseg);\r
 #endif\r
 \r
        MM_FreePtr(&compseg);\r
 #endif\r
 \r


@@ -1165,13 +1171,13 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit (gvar, "Can't open data/test.map!");\r
 /*#ifdef MAPHEADERLINKED\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit (gvar, "Can't open data/test.map!");\r
 /*#ifdef MAPHEADERLINKED\r

-       if ((maphandle = open("GAMEMAPS."EXTENSION,\r
+       if ((maphandle = open("GAMEMAPS.16"ENSION,\r

                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r

-               Quit ("Can't open GAMEMAPS."EXTENSION"!");\r
+               Quit ("Can't open GAMEMAPS.16"ENSION"!");\r

 #else\r
 #else\r

-       if ((maphandle = open("MAPTEMP."EXTENSION,\r
+       if ((maphandle = open("MAPTEMP.16"ENSION,\r

                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r

-               Quit ("Can't open MAPTEMP."EXTENSION"!");\r
+               Quit ("Can't open MAPTEMP.16"ENSION"!");\r

 #endif*/\r
 }\r
 \r
 #endif*/\r
 }\r
 \r


@@ -1195,9 +1201,9 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 // load maphead.ext (offsets and tileinfo for map file)\r
 //\r
 #ifndef AUDIOHEADERLINKED\r
 // load maphead.ext (offsets and tileinfo for map file)\r
 //\r
 #ifndef AUDIOHEADERLINKED\r

-       if ((handle = open("AUDIOHED."EXT,\r
+       if ((handle = open("AUDIOHED.16",\r

                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r

-               Quit (gvar, "Can't open AUDIOHED."EXT"!");\r
+               Quit (gvar, "Can't open AUDIOHED.16""!");\r

        length = filelength(handle);\r
        MM_GetPtr (MEMPTR audiostarts,length);\r
        CA_FarRead(handle, (byte far *)audiostarts, length);\r
        length = filelength(handle);\r
        MM_GetPtr (MEMPTR audiostarts,length);\r
        CA_FarRead(handle, (byte far *)audiostarts, length);\r


@@ -1212,13 +1218,13 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 // open the data file\r
 //\r
 #ifndef AUDIOHEADERLINKED\r
 // open the data file\r
 //\r
 #ifndef AUDIOHEADERLINKED\r

-       if ((audiohandle = open("AUDIOT."EXT,\r
+       if ((audiohandle = open("AUDIOT.16",\r

                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r

-               Quit (gvar, "Can't open AUDIOT."EXT"!");\r
+               Quit (gvar, "Can't open AUDIOT.16""!");\r

 #else\r
 #else\r

-       if ((audiohandle = open("AUDIO."EXT,\r
+       if ((audiohandle = open("AUDIO.16",\r

                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r

-               Quit (gvar, "Can't open AUDIO."EXT"!");\r
+               Quit (gvar, "Can't open AUDIO.16""!");\r

 #endif\r
 }*/\r
 \r
 #endif\r
 }*/\r
 \r


@@ -1329,7 +1335,7 @@ void CA_CacheAudioChunk (int chunk)
 \r
 // MDM begin - (GAMERS EDGE)\r
 //\r
 \r
 // MDM begin - (GAMERS EDGE)\r
 //\r

-       if (!FindFile("AUDIO."EXT,NULL,2))\r
+       if (!FindFile("AUDIO.16",NULL,2))\r

                Quit (gvar, "CA_CacheAudioChunk(): Can't find audio files.");\r
 //\r
 // MDM end\r
                Quit (gvar, "CA_CacheAudioChunk(): Can't find audio files.");\r
 //\r
 // MDM end\r


@@ -1604,7 +1610,7 @@ void CAL_CacheSprite (int chunk, byte far *compressed)
 //\r
 // expand the unshifted shape\r
 //\r
 //\r
 // expand the unshifted shape\r
 //\r

-       CAL_HuffExpand (compressed, &dest->data[0],smallplane*2,grhuffman);\r
+       CAL_HuffExpand (compressed, &dest->data[0],smallplane*2,gvar->ca.grhuffman);\r

 \r
 #endif\r
 \r
 \r
 #endif\r
 \r


@@ -1633,7 +1639,7 @@ void CAL_CacheSprite (int chunk, byte far *compressed)
 //\r
 // expand the unshifted shape\r
 //\r
 //\r
 // expand the unshifted shape\r
 //\r

-       CAL_HuffExpand (compressed, &dest->data[0],smallplane*5,grhuffman);\r
+       CAL_HuffExpand (compressed, &dest->data[0],smallplane*5,gvar->ca.grhuffman);\r

 \r
 //\r
 // make the shifts!\r
 \r
 //\r
 // make the shifts!\r


@@ -1765,7 +1771,7 @@ void CAL_ExpandGrChunk (int chunk, byte far *source)
                MM_GetPtr (&grsegs[chunk],expanded);\r
                if (mmerror)\r
                        return;\r
                MM_GetPtr (&grsegs[chunk],expanded);\r
                if (mmerror)\r
                        return;\r

-               CAL_HuffExpand (source,grsegs[chunk],expanded,grhuffman);\r
+               CAL_HuffExpand (source,grsegs[chunk],expanded,gvar->ca.grhuffman);\r

        }\r
 }\r
 */\r
        }\r
 }\r
 */\r


@@ -1801,11 +1807,11 @@ void CAL_ReadGrChunk (int chunk)
 \r
        compressed = GRFILEPOS(next)-pos;\r
 \r
 \r
        compressed = GRFILEPOS(next)-pos;\r
 \r

-       lseek(grhandle,pos,SEEK_SET);\r
+       lseek(gvar->ca.file.grhandle,pos,SEEK_SET);\r

 \r
        if (compressed<=BUFFERSIZE)\r
        {\r
 \r
        if (compressed<=BUFFERSIZE)\r
        {\r

-               CA_FarRead(grhandle,bufferseg,compressed);\r
+               CA_FarRead(gvar->ca.file.grhandle,bufferseg,compressed);\r

                source = bufferseg;\r
        }\r
        else\r
                source = bufferseg;\r
        }\r
        else\r


@@ -1814,7 +1820,7 @@ void CAL_ReadGrChunk (int chunk)
                if (mmerror)\r
                        return;\r
                MM_SetLock (&bigbufferseg,true);\r
                if (mmerror)\r
                        return;\r
                MM_SetLock (&bigbufferseg,true);\r

-               CA_FarRead(grhandle,bigbufferseg,compressed);\r
+               CA_FarRead(gvar->ca.file.grhandle,bigbufferseg,compressed);\r

                source = bigbufferseg;\r
        }\r
 \r
                source = bigbufferseg;\r
        }\r
 \r


@@ -1850,7 +1856,7 @@ void CA_CacheGrChunk (int chunk)
 \r
 // MDM begin - (GAMERS EDGE)\r
 //\r
 \r
 // MDM begin - (GAMERS EDGE)\r
 //\r

-       if (!FindFile("EGAGRAPH."EXT,NULL,2))\r
+       if (!FindFile("EGAGRAPH.16",NULL,2))\r

                Quit (gvar, "CA_CacheGrChunk(): Can't find graphics files.");\r
 //\r
 // MDM end\r
                Quit (gvar, "CA_CacheGrChunk(): Can't find graphics files.");\r
 //\r
 // MDM end\r


@@ -1869,18 +1875,18 @@ void CA_CacheGrChunk (int chunk)
 \r
        compressed = GRFILEPOS(next)-pos;\r
 \r
 \r
        compressed = GRFILEPOS(next)-pos;\r
 \r

-       lseek(grhandle,pos,SEEK_SET);\r
+       lseek(gvar->ca.file.grhandle,pos,SEEK_SET);\r

 \r
        if (compressed<=BUFFERSIZE)\r
        {\r
 \r
        if (compressed<=BUFFERSIZE)\r
        {\r

-               CA_FarRead(grhandle,bufferseg,compressed);\r
+               CA_FarRead(gvar->ca.file.grhandle,bufferseg,compressed);\r

                source = bufferseg;\r
        }\r
        else\r
        {\r
                MM_GetPtr(&bigbufferseg,compressed);\r
                MM_SetLock (&bigbufferseg,true);\r
                source = bufferseg;\r
        }\r
        else\r
        {\r
                MM_GetPtr(&bigbufferseg,compressed);\r
                MM_SetLock (&bigbufferseg,true);\r

-               CA_FarRead(grhandle,bigbufferseg,compressed);\r
+               CA_FarRead(gvar->ca.file.grhandle,bigbufferseg,compressed);\r

                source = bigbufferseg;\r
        }\r
 \r
                source = bigbufferseg;\r
        }\r
 \r


@@ -2317,7 +2323,7 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
 \r
 // MDM begin - (GAMERS EDGE)\r
 //\r
 \r
 // MDM begin - (GAMERS EDGE)\r
 //\r

-//     if (!FindFile("EGAGRAPH."EXT,NULL,2))\r
+//     if (!FindFile("EGAGRAPH.16",NULL,2))\r

 //             Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");\r
 //\r
 // MDM end\r
 //             Quit (gvar, "CA_CacheMarks(): Can't find graphics files.");\r
 //\r
 // MDM end\r


@@ -2388,8 +2394,8 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
                                                        next = NUMCHUNKS;                       // read pos to posend\r
                                        }\r
 \r
                                                        next = NUMCHUNKS;                       // read pos to posend\r
                                        }\r
 \r

-                                       lseek(grhandle,pos,SEEK_SET);\r
-                                       CA_FarRead(grhandle,(gvar->mm.bufferseg),endpos-pos,gvar);\r
+                                       lseek(gvar->ca.file.grhandle,pos,SEEK_SET);\r
+                                       CA_FarRead(gvar->ca.file.grhandle,(gvar->mm.bufferseg),endpos-pos,gvar);\r

                                        bufferstart = pos;\r
                                        bufferend = endpos;\r
                                        source = bufferseg;\r
                                        bufferstart = pos;\r
                                        bufferend = endpos;\r
                                        source = bufferseg;\r


@@ -2402,8 +2408,8 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
                                if (mmerror)\r
                                        return;\r
                                MM_SetLock (&bigbufferseg,true);\r
                                if (mmerror)\r
                                        return;\r
                                MM_SetLock (&bigbufferseg,true);\r

-                               lseek(grhandle,pos,SEEK_SET);\r
-                               CA_FarRead(grhandle,bigbufferseg,compressed,gvar);\r
+                               lseek(gvar->ca.file.grhandle,pos,SEEK_SET);\r
+                               CA_FarRead(gvar->ca.file.grhandle,bigbufferseg,compressed,gvar);\r

                                source = bigbufferseg;\r
                        }\r
 \r
                                source = bigbufferseg;\r
                        }\r
 \r


@@ -2422,3 +2428,13 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
                if (dialog && finishcachebox)\r
                        finishcachebox();\r
 }*/\r
                if (dialog && finishcachebox)\r
                        finishcachebox();\r
 }*/\r

+\r
+void CA_CannotOpen(char *string, global_game_variables_t *gvar)\r
+{\r
+ char str[30];\r
+\r
+ strcpy(str,"Can't open ");\r
+ strcat(str,string);\r
+ strcat(str,"!\n");\r
+ Quit (gvar, str);\r
+}\r

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index bd762016703d70179be9fd93338d0d0198f64d36..db9cba58101e41249eabf3318683c00c7cb217bb 100755 (executable)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -27,7 +27,8 @@
 \r
 //===========================================================================\r
 \r
 \r
 //===========================================================================\r
 \r

-//#define NOMAPS\r
+/*moved to src/lib/16_tdef.h\r
+#define NOMAPS\r

 #define NOGRAPHICS\r
 #define NOAUDIO\r
 \r
 #define NOGRAPHICS\r
 #define NOAUDIO\r
 \r


@@ -35,8 +36,8 @@
 //#define GRHEADERLINKED\r
 #define AUDIOHEADERLINKED\r
 \r
 //#define GRHEADERLINKED\r
 #define AUDIOHEADERLINKED\r
 \r

-//#define NUMMAPS              39\r
-//#define MAPPLANES            3\r
+#define NUMMAPS                39\r
+#define MAPPLANES              3*/\r

 //++++#define PROFILE//++++\r
 \r
 //===========================================================================\r
 //++++#define PROFILE//++++\r
 \r
 //===========================================================================\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 3aeb85b1f529dc7a943190c6a3463ff2eb06a1c2..6fe2c646bb754b1be7970b235f8b194676a7433b 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -644,8 +644,26 @@ typedef struct
 //from 16_ca\r
 //==========================================================================\r
 \r
 //from 16_ca\r
 //==========================================================================\r
 \r

+#define NOMAPS\r
+#define NOGRAPHICS\r
+#define NOAUDIO\r
+\r
+#define MAPHEADERLINKED\r
+//#define GRHEADERLINKED\r
+#define AUDIOHEADERLINKED\r
+\r

 #define NUMMAPS                4//39\r
 #define NUMMAPS                4//39\r

-#define NUMSNDCHUNKS           84\r
+#define NUMSNDCHUNKS           4//3\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 EXTENSION      "hb1"\r
+\r

 \r
 typedef struct\r
 {\r
 \r
 typedef struct\r
 {\r


@@ -696,7 +714,19 @@ typedef struct     //TODO: USE THIS!!!!
        word            _seg    *grstarts;      // array of offsets in egagraph, -1 for sparse//long\r
        word            _seg    *audiostarts;   // array of offsets in audio / audiot//long\r
 \r
        word            _seg    *grstarts;      // array of offsets in egagraph, -1 for sparse//long\r
        word            _seg    *audiostarts;   // array of offsets in audio / audiot//long\r
 \r

-       huffnode        huffnode;\r
+#ifdef GRHEADERLINKED\r
+       huffnode        *grhuffman;\r
+#else\r
+       huffnode        grhuffman[255];\r
+#endif\r
+\r
+#ifdef AUDIOHEADERLINKED\r
+       huffnode        *audiohuffman;\r
+#else\r
+       huffnode        audiohuffman[255];\r
+#endif\r
+\r
+       long            chunkcomplen,chunkexplen;\r

 \r
        sd_t            sd;\r
        //TODO: extend! and learn from keen/wolf/catacomb's code wwww\r
 \r
        sd_t            sd;\r
        //TODO: extend! and learn from keen/wolf/catacomb's code wwww\r

diff --git a/src/util/shbat/qwolf.sh b/src/util/shbat/qwolf.sh
index d900d481f5e1e3ec3369e072f6cc7475b49fa014..28ab088c43ef77d12fdb8ccd04b68cbccf1b8dec 100755 (executable)
--- a/src/util/shbat/qwolf.sh
+++ b/src/util/shbat/qwolf.sh
@@ -5,7 +5,9 @@ dir2="16/wolf3d/WOLFSRC"
 echo ====      $dir1   ====
 grep "$1" "$dir1"/*.c
 grep "$1" "$dir1"/*.h
 echo ====      $dir1   ====
 grep "$1" "$dir1"/*.c
 grep "$1" "$dir1"/*.h

+grep "$1" "$dir1"/*.asm

 echo ====      $dir2   ====
 grep "$1" "$dir2"/*.C
 grep "$1" "$dir2"/*.H
 echo ====      $dir2   ====
 grep "$1" "$dir2"/*.C
 grep "$1" "$dir2"/*.H

+grep "$1" "$dir2"/*.ASM

 . ./src/util/qfoot.sh $0
 . ./src/util/qfoot.sh $0