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

diff --git a/BCWOLF.LOG b/BCWOLF.LOG
new file mode 100755 (executable)
index 0000000..f1a3abc
--- /dev/null
+++ b/BCWOLF.LOG
@@ -0,0 +1,25 @@
+VL_MungePic====================================\r
+4EC3:FFAE      (memptr *)&temp\r
+4EC3:FFAE      (memptr)temp\r
+460A:4628      &temp\r
+4628:3DC2      temp\r
+===============================================\r
+       SDL_SetDS():    OK\r
+CAL_SetupGrFile:\r
+       chunkcomplen size is 350\r
+CalcHeight()\r
+heightnumerator\r
+211968 15360   828     0\r
+a      6234\r
+b      12\r
+d      8734\r
+d      8\r
+ax     4\r
+al     5\r
+       nx      0\r
+pee    2408\r
+gxt    gyt     nx      gx      gy\r
+0      0       22528   0       0\r
+0      0       0       0       22528\r
+ch     14\r
+compiled on Apr 19 2017  12:39:47\r

diff --git a/__seguse.txt b/__seguse.txt
index d9d49f5661ed2d8627aa1e28c98736422ffb9d87..720dc06a657c84409a96b69eb06dfc363284da9f 100755 (executable)
--- a/__seguse.txt
+++ b/__seguse.txt
@@ -1,6 +1,6 @@
--------------------------------------------------------------------------------
-                                       ./qkeen.sh start
--------------------------------------------------------------------------------
+-------------------------------------------------------------------------------\r
+                                       ./qkeen.sh start\r
+-------------------------------------------------------------------------------\r
 16/keen/id_ca.c:byte           _seg    *tinf;\r
 16/keen/id_ca.c:unsigned       _seg    *mapsegs[3];\r
 16/keen/id_ca.c:maptype                _seg    *mapheaderseg[NUMMAPS];\r
@@ -66,11 +66,11 @@
 16/keen/id_vw.h:extern pictabletype    _seg *pictable;\r
 16/keen/id_vw.h:extern pictabletype    _seg *picmtable;\r
 16/keen/id_vw.h:extern spritetabletype _seg *spritetable;\r
-===============                ./qkeen.sh end          ===============
--------------------------------------------------------------------------------
-                                       ./qwolf.sh start
--------------------------------------------------------------------------------
-==== 16/wf3d8086 ====
+===============                ./qkeen.sh end          ===============\r
+-------------------------------------------------------------------------------\r
+                                       ./qwolf.sh start\r
+-------------------------------------------------------------------------------\r
+==== 16/wf3d8086 ====\r
 16/wf3d8086/contigsc.c:byte _seg       *endscalermemory;\r
 16/wf3d8086/contigsc.c:        endscalermemory = (void _seg *)(seg+ofs/16);\r
 16/wf3d8086/contigsc.c:        t_compshape     _seg *shape;\r
@@ -103,13 +103,6 @@
 16/wf3d8086/id_vh.c:   src = (byte _seg *)grsegs[STARTTILE8];\r
 16/wf3d8086/id_vh.c:   src = (byte _seg *)grsegs[STARTTILE16];\r
 16/wf3d8086/id_vh.c:           src = (byte _seg *)grsegs[STARTTILE16+i];\r
-16/wf3d8086/oldscale.c:t_compscale _seg *scaledirectory[MAXSCALEHEIGHT+1];\r
-16/wf3d8086/oldscale.c:t_compscale     _seg *work;\r
-16/wf3d8086/oldscale.c:        _fmemcpy ((byte _seg *)(*finalspot),(byte _seg *)work,totalsize);\r
-16/wf3d8086/oldscale.c:        t_compshape     _seg *shape;\r
-16/wf3d8086/oldscale.c:        t_compscale _seg *comptable;\r
-16/wf3d8086/oldscale.c:        t_compshape     _seg *shape;\r
-16/wf3d8086/oldscale.c:        t_compscale _seg *comptable;\r
 16/wf3d8086/wl_debug.c:        spritetype _seg *block;\r
 16/wf3d8086/wl_debug.c:extern  word    _seg *DigiList;\r
 16/wf3d8086/wl_menu.c: fontstruct _seg *font;\r
@@ -137,78 +130,71 @@
 16/wf3d8086/id_vh.h:extern     pictabletype    _seg *picmtable;\r
 16/wf3d8086/id_vh.h:extern     spritetabletype _seg *spritetable;\r
 16/wf3d8086/wl_def.h:extern    t_compscale _seg *scaledirectory[MAXSCALEHEIGHT+1];\r
-==== 16/wolf3d/WOLFSRC ====
-16/wolf3d/WOLFSRC/CONTIGSC.C:byte _seg *endscalermemory;
-16/wolf3d/WOLFSRC/CONTIGSC.C:  endscalermemory = (void _seg *)(seg+ofs/16);
-16/wolf3d/WOLFSRC/CONTIGSC.C:  t_compshape     _seg *shape;
-16/wolf3d/WOLFSRC/CONTIGSC.C:  t_compshape     _seg *shape;
-16/wolf3d/WOLFSRC/ID_CA.C:byte                 _seg    *tinf;
-16/wolf3d/WOLFSRC/ID_CA.C:unsigned     _seg    *mapsegs[MAPPLANES];
-16/wolf3d/WOLFSRC/ID_CA.C:maptype              _seg    *mapheaderseg[NUMMAPS];
-16/wolf3d/WOLFSRC/ID_CA.C:byte         _seg    *audiosegs[NUMSNDCHUNKS];
-16/wolf3d/WOLFSRC/ID_CA.C:void         _seg    *grsegs[NUMCHUNKS];
-16/wolf3d/WOLFSRC/ID_CA.C:long         _seg *grstarts; // array of offsets in egagraph, -1 for sparse
-16/wolf3d/WOLFSRC/ID_CA.C:long         _seg *audiostarts;      // array of offsets in audio / audiot
-16/wolf3d/WOLFSRC/ID_CA.C:     grstarts = (long _seg *)FP_SEG(&EGAhead);
-16/wolf3d/WOLFSRC/ID_CA.C:     tinf = (byte _seg *)FP_SEG(&maphead);
-16/wolf3d/WOLFSRC/ID_CA.C:             pos = ((mapfiletype     _seg *)tinf)->headeroffsets[i];
-16/wolf3d/WOLFSRC/ID_CA.C:     audiostarts = (long _seg *)FP_SEG(&audiohead);
-16/wolf3d/WOLFSRC/ID_CA.C:             ((mapfiletype _seg *)tinf)->RLEWtag);
-16/wolf3d/WOLFSRC/ID_CA.C:             ((mapfiletype _seg *)tinf)->RLEWtag);
-16/wolf3d/WOLFSRC/ID_CA.C:                                     source = (byte _seg *)bufferseg+(pos-bufferstart);
-16/wolf3d/WOLFSRC/ID_IN.C:             byte _seg       *DemoBuffer;
-16/wolf3d/WOLFSRC/ID_PM.C:                                     _seg *PMSegPages;
-16/wolf3d/WOLFSRC/ID_PM.C:     void                    _seg *buf;
-16/wolf3d/WOLFSRC/ID_PM.C:             MM_FreePtr(&(void _seg *)PMSegPages);
-16/wolf3d/WOLFSRC/ID_SD.C:     word            *SoundTable;    // Really * _seg *SoundTable, but that don't work
-16/wolf3d/WOLFSRC/ID_SD.C:             word                    _seg *DigiList;
-16/wolf3d/WOLFSRC/ID_VH.C:pictabletype _seg *pictable;
-16/wolf3d/WOLFSRC/ID_VH.C:     byte            _seg *temp, far *dest, far *srcline;
-16/wolf3d/WOLFSRC/ID_VH.C:     , fontstruct _seg *font)
-16/wolf3d/WOLFSRC/ID_VH.C:     VWL_MeasureString(string,width,height,(fontstruct _seg *)grsegs[STARTFONT+fontnumber]);
-16/wolf3d/WOLFSRC/ID_VH.C:     VWL_MeasureString(string,width,height,(fontstruct _seg *)grsegs[STARTFONTM+fontnumber]);
-16/wolf3d/WOLFSRC/ID_VH.C:     src = (byte _seg *)grsegs[STARTTILE8];
-16/wolf3d/WOLFSRC/ID_VH.C:     src = (byte _seg *)grsegs[STARTTILE16];
-16/wolf3d/WOLFSRC/ID_VH.C:             src = (byte _seg *)grsegs[STARTTILE16+i];
-16/wolf3d/WOLFSRC/OLDSCALE.C:t_compscale _seg *scaledirectory[MAXSCALEHEIGHT+1];
-16/wolf3d/WOLFSRC/OLDSCALE.C:t_compscale       _seg *work;
-16/wolf3d/WOLFSRC/OLDSCALE.C:  _fmemcpy ((byte _seg *)(*finalspot),(byte _seg *)work,totalsize);
-16/wolf3d/WOLFSRC/OLDSCALE.C:  t_compshape     _seg *shape;
-16/wolf3d/WOLFSRC/OLDSCALE.C:  t_compscale _seg *comptable;
-16/wolf3d/WOLFSRC/OLDSCALE.C:  t_compshape     _seg *shape;
-16/wolf3d/WOLFSRC/OLDSCALE.C:  t_compscale _seg *comptable;
-16/wolf3d/WOLFSRC/WL_DEBUG.C:  spritetype _seg *block;
-16/wolf3d/WOLFSRC/WL_DEBUG.C:extern    word    _seg *DigiList;
-16/wolf3d/WOLFSRC/WL_MENU.C:   fontstruct _seg *font;
-16/wolf3d/WOLFSRC/WL_SCALE.C:t_compscale _seg *scaledirectory[MAXSCALEHEIGHT+1];
-16/wolf3d/WOLFSRC/WL_SCALE.C:t_compscale       _seg *work;
-16/wolf3d/WOLFSRC/WL_SCALE.C:  _fmemcpy ((byte _seg *)(*finalspot),(byte _seg *)work,totalsize);
-16/wolf3d/WOLFSRC/WL_SCALE.C:  t_compshape     _seg *shape;
-16/wolf3d/WOLFSRC/WL_SCALE.C:  t_compscale _seg *comptable;
-16/wolf3d/WOLFSRC/WL_SCALE.C:  t_compshape     _seg *shape;
-16/wolf3d/WOLFSRC/WL_SCALE.C:  t_compscale _seg *comptable;
-16/wolf3d/WOLFSRC/WL_TEXT.C:   text = (char _seg *)grsegs[artnum];
-16/wolf3d/WOLFSRC/WL_TEXT.C:   text = (char _seg *)layout;
-16/wolf3d/WOLFSRC/WL_TEXT.C:   text = (char _seg *)grsegs[artnum];
-16/wolf3d/WOLFSRC/WL_TEXT.C:   text = (char _seg *)layout;
-16/wolf3d/WOLFSRC/ID_CA.H:extern       byte            _seg    *tinf;
-16/wolf3d/WOLFSRC/ID_CA.H:extern       unsigned        _seg    *mapsegs[MAPPLANES];
-16/wolf3d/WOLFSRC/ID_CA.H:extern       maptype         _seg    *mapheaderseg[NUMMAPS];
-16/wolf3d/WOLFSRC/ID_CA.H:extern       byte            _seg    *audiosegs[NUMSNDCHUNKS];
-16/wolf3d/WOLFSRC/ID_CA.H:extern       void            _seg    *grsegs[NUMCHUNKS];
-16/wolf3d/WOLFSRC/ID_CA.H:extern long          _seg *grstarts; // array of offsets in egagraph, -1 for sparse
-16/wolf3d/WOLFSRC/ID_CA.H:extern long          _seg *audiostarts;      // array of offsets in audio / audiot
-16/wolf3d/WOLFSRC/ID_IN.H:extern       byte _seg       *DemoBuffer;
-16/wolf3d/WOLFSRC/ID_MM.H:typedef void _seg * memptr;
-16/wolf3d/WOLFSRC/ID_VH.H:extern       pictabletype    _seg *pictable;
-16/wolf3d/WOLFSRC/ID_VH.H:extern       pictabletype    _seg *picmtable;
-16/wolf3d/WOLFSRC/ID_VH.H:extern       spritetabletype _seg *spritetable;
-16/wolf3d/WOLFSRC/WL_DEF.H:extern      t_compscale _seg *scaledirectory[MAXSCALEHEIGHT+1];
-===============                ./qwolf.sh end          ===============
--------------------------------------------------------------------------------
-                                       ./qcata.sh start
--------------------------------------------------------------------------------
-==== 16/Catacomb3D ====
+==== 16/wolf3d/WOLFSRC ====\r
+16/wolf3d/WOLFSRC/CONTIGSC.C:byte _seg *endscalermemory;\r
+16/wolf3d/WOLFSRC/CONTIGSC.C:  endscalermemory = (void _seg *)(seg+ofs/16);\r
+16/wolf3d/WOLFSRC/CONTIGSC.C:  t_compshape     _seg *shape;\r
+16/wolf3d/WOLFSRC/CONTIGSC.C:  t_compshape     _seg *shape;\r
+16/wolf3d/WOLFSRC/ID_CA.C:byte                 _seg    *tinf;\r
+16/wolf3d/WOLFSRC/ID_CA.C:unsigned     _seg    *mapsegs[MAPPLANES];\r
+16/wolf3d/WOLFSRC/ID_CA.C:maptype              _seg    *mapheaderseg[NUMMAPS];\r
+16/wolf3d/WOLFSRC/ID_CA.C:byte         _seg    *audiosegs[NUMSNDCHUNKS];\r
+16/wolf3d/WOLFSRC/ID_CA.C:void         _seg    *grsegs[NUMCHUNKS];\r
+16/wolf3d/WOLFSRC/ID_CA.C:long         _seg *grstarts; // array of offsets in egagraph, -1 for sparse\r
+16/wolf3d/WOLFSRC/ID_CA.C:long         _seg *audiostarts;      // array of offsets in audio / audiot\r
+16/wolf3d/WOLFSRC/ID_CA.C:     grstarts = (long _seg *)FP_SEG(&EGAhead);\r
+16/wolf3d/WOLFSRC/ID_CA.C:     tinf = (byte _seg *)FP_SEG(&maphead);\r
+16/wolf3d/WOLFSRC/ID_CA.C:             pos = ((mapfiletype     _seg *)tinf)->headeroffsets[i];\r
+16/wolf3d/WOLFSRC/ID_CA.C:     audiostarts = (long _seg *)FP_SEG(&audiohead);\r
+16/wolf3d/WOLFSRC/ID_CA.C:             ((mapfiletype _seg *)tinf)->RLEWtag);\r
+16/wolf3d/WOLFSRC/ID_CA.C:             ((mapfiletype _seg *)tinf)->RLEWtag);\r
+16/wolf3d/WOLFSRC/ID_CA.C:                                     source = (byte _seg *)bufferseg+(pos-bufferstart);\r
+16/wolf3d/WOLFSRC/ID_IN.C:             byte _seg       *DemoBuffer;\r
+16/wolf3d/WOLFSRC/ID_PM.C:                                     _seg *PMSegPages;\r
+16/wolf3d/WOLFSRC/ID_PM.C:     void                    _seg *buf;\r
+16/wolf3d/WOLFSRC/ID_PM.C:             MM_FreePtr(&(void _seg *)PMSegPages);\r
+16/wolf3d/WOLFSRC/ID_SD.C:     word            *SoundTable;    // Really * _seg *SoundTable, but that don't work\r
+16/wolf3d/WOLFSRC/ID_SD.C:             word                    _seg *DigiList;\r
+16/wolf3d/WOLFSRC/ID_VH.C:pictabletype _seg *pictable;\r
+16/wolf3d/WOLFSRC/ID_VH.C:     byte            _seg *temp, far *dest, far *srcline;\r
+16/wolf3d/WOLFSRC/ID_VH.C:     , fontstruct _seg *font)\r
+16/wolf3d/WOLFSRC/ID_VH.C:     VWL_MeasureString(string,width,height,(fontstruct _seg *)grsegs[STARTFONT+fontnumber]);\r
+16/wolf3d/WOLFSRC/ID_VH.C:     VWL_MeasureString(string,width,height,(fontstruct _seg *)grsegs[STARTFONTM+fontnumber]);\r
+16/wolf3d/WOLFSRC/ID_VH.C:     src = (byte _seg *)grsegs[STARTTILE8];\r
+16/wolf3d/WOLFSRC/ID_VH.C:     src = (byte _seg *)grsegs[STARTTILE16];\r
+16/wolf3d/WOLFSRC/ID_VH.C:             src = (byte _seg *)grsegs[STARTTILE16+i];\r
+16/wolf3d/WOLFSRC/WL_DEBUG.C:  spritetype _seg *block;\r
+16/wolf3d/WOLFSRC/WL_DEBUG.C:extern    word    _seg *DigiList;\r
+16/wolf3d/WOLFSRC/WL_MENU.C:   fontstruct _seg *font;\r
+16/wolf3d/WOLFSRC/WL_SCALE.C:t_compscale _seg *scaledirectory[MAXSCALEHEIGHT+1];\r
+16/wolf3d/WOLFSRC/WL_SCALE.C:t_compscale       _seg *work;\r
+16/wolf3d/WOLFSRC/WL_SCALE.C:  _fmemcpy ((byte _seg *)(*finalspot),(byte _seg *)work,totalsize);\r
+16/wolf3d/WOLFSRC/WL_SCALE.C:  t_compshape     _seg *shape;\r
+16/wolf3d/WOLFSRC/WL_SCALE.C:  t_compscale _seg *comptable;\r
+16/wolf3d/WOLFSRC/WL_SCALE.C:  t_compshape     _seg *shape;\r
+16/wolf3d/WOLFSRC/WL_SCALE.C:  t_compscale _seg *comptable;\r
+16/wolf3d/WOLFSRC/WL_TEXT.C:   text = (char _seg *)grsegs[artnum];\r
+16/wolf3d/WOLFSRC/WL_TEXT.C:   text = (char _seg *)layout;\r
+16/wolf3d/WOLFSRC/WL_TEXT.C:   text = (char _seg *)grsegs[artnum];\r
+16/wolf3d/WOLFSRC/WL_TEXT.C:   text = (char _seg *)layout;\r
+16/wolf3d/WOLFSRC/ID_CA.H:extern       byte            _seg    *tinf;\r
+16/wolf3d/WOLFSRC/ID_CA.H:extern       unsigned        _seg    *mapsegs[MAPPLANES];\r
+16/wolf3d/WOLFSRC/ID_CA.H:extern       maptype         _seg    *mapheaderseg[NUMMAPS];\r
+16/wolf3d/WOLFSRC/ID_CA.H:extern       byte            _seg    *audiosegs[NUMSNDCHUNKS];\r
+16/wolf3d/WOLFSRC/ID_CA.H:extern       void            _seg    *grsegs[NUMCHUNKS];\r
+16/wolf3d/WOLFSRC/ID_CA.H:extern long          _seg *grstarts; // array of offsets in egagraph, -1 for sparse\r
+16/wolf3d/WOLFSRC/ID_CA.H:extern long          _seg *audiostarts;      // array of offsets in audio / audiot\r
+16/wolf3d/WOLFSRC/ID_IN.H:extern       byte _seg       *DemoBuffer;\r
+16/wolf3d/WOLFSRC/ID_MM.H:typedef void _seg * memptr;\r
+16/wolf3d/WOLFSRC/ID_VH.H:extern       pictabletype    _seg *pictable;\r
+16/wolf3d/WOLFSRC/ID_VH.H:extern       pictabletype    _seg *picmtable;\r
+16/wolf3d/WOLFSRC/ID_VH.H:extern       spritetabletype _seg *spritetable;\r
+16/wolf3d/WOLFSRC/WL_DEF.H:extern      t_compscale _seg *scaledirectory[MAXSCALEHEIGHT+1];\r
+===============                ./qwolf.sh end          ===============\r
+-------------------------------------------------------------------------------\r
+                                       ./qcata.sh start\r
+-------------------------------------------------------------------------------\r
+==== 16/Catacomb3D ====\r
 16/Catacomb3D/C3_DEBUG.C:      spritetype _seg *block;\r
 16/Catacomb3D/C3_GAME.C:       text = (char _seg *)grsegs[LEVEL1TEXT+mapon];\r
 16/Catacomb3D/C3_GAME.C:       src = (byte _seg *)grsegs[STARTTILE8];\r
@@ -277,7 +263,7 @@
 16/Catacomb3D/ID_VW.H:extern   pictabletype    _seg *pictable;\r
 16/Catacomb3D/ID_VW.H:extern   pictabletype    _seg *picmtable;\r
 16/Catacomb3D/ID_VW.H:extern   spritetabletype _seg *spritetable;\r
-==== 16/CatacombApocalypse ====
+==== 16/CatacombApocalypse ====\r
 16/CatacombApocalypse/C6_GAME.C:       text = (char _seg *)grsegs[LEVEL1TEXT+mapon];\r
 16/CatacombApocalypse/C6_GAME.C:       src = (byte _seg *)grsegs[STARTTILE8];\r
 16/CatacombApocalypse/C6_GAME.C:       src = (byte _seg *)grsegs[STARTTILE16];\r
@@ -349,4 +335,4 @@
 16/CatacombApocalypse/ID_VW.H:extern   pictabletype    _seg *picmtable;\r
 16/CatacombApocalypse/ID_VW.H:extern   spritetabletype _seg *spritetable;\r
 16/CatacombApocalypse/ID_VW.H:void VWL_MeasureString (char far *string, word *width, word *height, fontstruct _seg *font);\r
-===============                ./qcata.sh end          ===============
+===============                ./qcata.sh end          ===============\r

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 8742c046d2e4ce903ad7ff3ba1661392443b9bd9..ea73aa996358518a0b7b5e279202d17271ea8579 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -57,7 +57,7 @@
 \r
 #define BBUFNAME gvar.mm.bufferseg//bigbuffer\r
 //#define INITBBUF static memptr BBUFNAME;\r
-#define BBUFPTR        MEMPTR BBUFNAME\r
+#define BBUFPTR        MEMPTRCONV BBUFNAME\r
 \r
 #ifdef __BORLANDC__\r
 #define BBUF           (memptr *)BBUFPTR\r

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 8dd2da0af0c5d8b017a6074f74501c548111a8c3..64c6674a9be661d57e6ca73a14fa5b8b116c13d9 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1041,7 +1041,9 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 {\r
        char fname[13];\r
        int handle;\r
+#if NUMPICS>0\r
        memptr compseg;\r
+#endif\r
 \r
 #ifdef GRHEADERLINKED\r
 \r
@@ -1069,7 +1071,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 //\r
 // load the data offsets from ???head.ext\r
 //\r
-       MM_GetPtr (MEMPTR gvar->ca.grstarts,(NUMCHUNKS+1)*FILEPOSSIZE, gvar);\r
+       MM_GetPtr (MEMPTRCONV gvar->ca.grstarts,(NUMCHUNKS+1)*FILEPOSSIZE, gvar);\r
 \r
        strcpy(fname,GHEADNAME);\r
        strcat(fname,EXTENSION);\r
@@ -1100,7 +1102,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 // load the pic and sprite headers into the arrays in the data segment\r
 //\r
 #if NUMPICS>0\r
-       MM_GetPtr(MEMPTR gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar);\r
+       MM_GetPtr(MEMPTRCONV 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
@@ -1109,7 +1111,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 #endif\r
 \r
 #if NUMPICM>0\r
-       MM_GetPtr(MEMPTR picmtable,NUMPICM*sizeof(pictabletype));\r
+       MM_GetPtr(MEMPTRCONV picmtable,NUMPICM*sizeof(pictabletype));\r
        CAL_GetGrChunkLength(STRUCTPICM);               // position file pointer\r
        MM_GetPtr(&compseg,gvar->ca.chunkcomplen);\r
        CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen);\r
@@ -1118,7 +1120,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 #endif\r
 \r
 #if NUMSPRITES>0\r
-       MM_GetPtr(MEMPTR spritetable,NUMSPRITES*sizeof(spritetabletype));\r
+       MM_GetPtr(MEMPTRCONV spritetable,NUMSPRITES*sizeof(spritetabletype));\r
        CAL_GetGrChunkLength(STRUCTSPRITE);     // position file pointer\r
        MM_GetPtr(&compseg,gvar->ca.chunkcomplen);\r
        CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen);\r
@@ -1154,7 +1156,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit (gvar, "Can't open maphead.mph");\r
        length = filelength(handle);\r
-       MM_GetPtr (MEMPTR gvar->ca.tinf,length,gvar);\r
+       MM_GetPtr (MEMPTRCONV gvar->ca.tinf,length,gvar);\r
        CA_FarRead(handle, gvar->ca.tinf, length,gvar);\r
        close(handle);\r
 //#else\r
@@ -1205,7 +1207,7 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
                Quit (gvar, "Can't open AUDIOHED.16""!");\r
        length = filelength(handle);\r
-       MM_GetPtr (MEMPTR audiostarts,length);\r
+       MM_GetPtr (MEMPTRCONV audiostarts,length);\r
        CA_FarRead(handle, (byte far *)audiostarts, length);\r
        close(handle);\r
 #else\r
@@ -1329,7 +1331,7 @@ void CA_CacheAudioChunk (int chunk)
 \r
        if (audiosegs[chunk])\r
        {\r
-               MM_SetPurge (MEMPTR audiosegs[chunk],0);\r
+               MM_SetPurge (MEMPTRCONV audiosegs[chunk],0);\r
                return;                                                 // allready in memory\r
        }\r
 \r
@@ -1351,7 +1353,7 @@ void CA_CacheAudioChunk (int chunk)
 \r
 #ifndef AUDIOHEADERLINKED\r
 \r
-       MM_GetPtr (MEMPTR audiosegs[chunk],compressed);\r
+       MM_GetPtr (MEMPTRCONV audiosegs[chunk],compressed);\r
        if (mmerror)\r
                return;\r
 \r
@@ -1376,7 +1378,7 @@ void CA_CacheAudioChunk (int chunk)
 \r
        expanded = *(long far *)source;\r
        source += 4;                    // skip over length\r
-       MM_GetPtr (MEMPTR audiosegs[chunk],expanded);\r
+       MM_GetPtr (MEMPTRCONV audiosegs[chunk],expanded);\r
        if (mmerror)\r
                goto done;\r
        CAL_HuffExpand (source,audiosegs[chunk],expanded,audiohuffman);\r
@@ -1417,7 +1419,7 @@ void CA_LoadAllSounds (void)
 \r
        for (i=0;i<NUMSOUNDS;i++,start++)\r
                if (audiosegs[start])\r
-                       MM_SetPurge (MEMPTR audiosegs[start],3);                // make purgable\r
+                       MM_SetPurge (MEMPTRCONV audiosegs[start],3);            // make purgable\r
 \r
 cachein:\r
 \r
@@ -1945,12 +1947,12 @@ void CA_CacheMap (global_game_variables_t *gvar)
 //             if (pos<0)                                              // $FFFFFFFF start is a sparse map\r
 //               printf("CA_CacheMap: Tried to load a non existent map!");\r
 \r
-//             MM_GetPtr(MEMPTR gvar->ca.camapheaderseg[mapnum],sizeof(maptype));\r
+//             MM_GetPtr(MEMPTRCONV gvar->ca.camapheaderseg[mapnum],sizeof(maptype));\r
 //             lseek(maphandle,pos,SEEK_SET);\r
 //             CA_FarRead (maphandle,(memptr)mapheaderseg[mapnum],sizeof(maptype));\r
 //     }\r
 //     else\r
-//             MM_SetPurge (MEMPTR mapheaderseg[mapnum], 0, &(gvar->mm));\r
+//             MM_SetPurge (MEMPTRCONV mapheaderseg[mapnum], 0, &(gvar->mm));\r
 \r
 //\r
 // load the planes in\r
@@ -1968,7 +1970,7 @@ void CA_CacheMap (global_game_variables_t *gvar)
                if (!compressed)\r
                        continue;               // the plane is not used in this game\r
 \r
-               dest = MEMPTR mapsegs[plane];\r
+               dest = MEMPTRCONV mapsegs[plane];\r
                MM_GetPtr(dest,size);\r
 \r
                lseek(maphandle,pos,SEEK_SET);\r

diff --git a/src/lib/16_sd.c b/src/lib/16_sd.c
index b82ff3e8b1658b028c6a5e93f0e0934c1e07667a..610f7ed0d2e867c555acd7d2f9bc61fcbeeae143 100755 (executable)
--- a/src/lib/16_sd.c
+++ b/src/lib/16_sd.c
@@ -226,7 +226,7 @@ void SD_Initimf(global_game_variables_t *gvar)
 void SD_imf_free_music(global_game_variables_t *gvar)\r
 {\r
 //     if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);\r
-       MM_FreePtr(MEMPTR gvar->ca.audiosegs[0], gvar); //TODO make behave like id engine\r
+       MM_FreePtr(MEMPTRCONV gvar->ca.audiosegs[0], gvar);     //TODO make behave like id engine\r
        gvar->ca.sd.imf_music = gvar->ca.sd.imf_play_ptr = gvar->ca.sd.imf_music_end = NULL;\r
        gvar->ca.sd.imf_delay_countdown = 0;\r
 }\r
@@ -256,7 +256,7 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
        }\r
        len -= len & 3;\r
 \r
-       MM_GetPtr(MEMPTR gvar->ca.audiosegs[0],len, gvar);\r
+       MM_GetPtr(MEMPTRCONV gvar->ca.audiosegs[0],len, gvar);\r
        gvar->ca.sd.imf_music = (struct imf_entry *)gvar->ca.audiosegs[0];\r
        if (gvar->ca.sd.imf_music == NULL) {\r
                close(fd);\r

diff --git a/src/lib/16_t.h b/src/lib/16_t.h
index ce881ae877ed7e658d7d5ec6496f328c190f3d53..764bf51e7d5387e979d18d8dc36eaa5a50ad0eb2 100755 (executable)
--- a/src/lib/16_t.h
+++ b/src/lib/16_t.h
@@ -65,9 +65,28 @@ MK_FP(segment value, 0)*/
 \r
 typedef void _seg * memptr;\r
 \r
-#define MEMPTR (memptr *)&//old is &(memptr)\r
+#define MEMPTRCONV                     (memptr *)&\r
 \r
+//bcc\r
+#ifdef __BORLANDC__\r
+#define MEMPTRANDPERCONV       &\r
+//#define BYTEFARPTRCONV               (unsigned char far *)\r
+//#define SMDPTRANDPERCONV     &\r
+//#define SDFPTRANDPERCONV     &\r
+//#define OBTPTRANDPERCONV     &\r
+//#define SDTPTRANDPERCONV     &\r
+#endif\r
+//\r
+\r
+//wcc\r
 #ifdef __WATCOMC__     //functions found in borland c but not watcom c\r
+#define MEMPTRANDPERCONV\r
+//#define BYTEFARPTRCONV\r
+//#define SMDPTRANDPERCONV     (void *)&\r
+//#define SDFPTRANDPERCONV     (struct diskfree_t *)&\r
+//#define OBTPTRANDPERCONV     (void const *)&\r
+//#define SDTPTRANDPERCONV     (struct dostime_t *)&\r
+\r
 #define _argv __argv\r
 #define _argc __argc\r
 #define geninterrupt(n) int86(n,&CPURegs,&CPURegs);\r

diff --git a/src/lib/vgmsnd/vgmSnd.c b/src/lib/vgmsnd/vgmSnd.c
index 30d3a383faa19d8e559deb2ec80abcf9aaf5b688..2cfd8690c36a008a07cdd7df39d383de07a833f9 100755 (executable)
--- a/src/lib/vgmsnd/vgmSnd.c
+++ b/src/lib/vgmsnd/vgmSnd.c
@@ -172,7 +172,7 @@ UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile, global_game_variables
 \r
        vgmFile->dataLen = vgmBaseHdr.lngEOFOffset + 0x04;\r
        //vgmFile->data = (UINT8*)malloc(vgmFile->dataLen);\r
-       MM_GetPtr(MEMPTR gvar->ca.audiosegs[0], vgmFile->dataLen, gvar);\r
+       MM_GetPtr(MEMPTRCONV gvar->ca.audiosegs[0], vgmFile->dataLen, gvar);\r
        vgmFile->data = (UINT8*)gvar->ca.audiosegs[0];\r
        if (vgmFile->data == NULL)\r
        {\r
@@ -217,7 +217,7 @@ UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile, global_game_variables
 void FreeVGMFile(VGM_FILE* vgmFile, global_game_variables_t *gvar)\r
 {\r
        //if(vgmFile->data){ free(vgmFile->data);       vgmFile->data = NULL; }\r
-       MM_FreePtr(MEMPTR gvar->ca.audiosegs[0], gvar);\r
+       MM_FreePtr(MEMPTRCONV gvar->ca.audiosegs[0], gvar);\r
        if(vgmFile->data) free(vgmFile->data);\r
        vgmFile->dataLen = 0;\r
 \r