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/makefile b/makefile
index 5c21b2ad782cbf256212191df6b5a115e5543cae..575e318f43b33078e2b0a6e88c73c7b9e8062e5d 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -119,7 +119,7 @@ UPXQ=-qqq
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#24576
+S_FLAGS=-sg -st -of+ -zu -zdp -zff -zgf -k32768#24576
 Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei
 O_FLAGS=-opnr -oe=24 -oil+ -outback -ohm
 T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ)## -e=65536

diff --git a/src/16.c b/src/16.c
index 7f22e1b6eafaeea9188a52557a52ba27e0114b6e..eb64dde7a63546dea3853e23fc42a472a8b7f8c8 100755 (executable)
--- a/src/16.c
+++ b/src/16.c
@@ -54,6 +54,6 @@ main(int argc, char *argv[])
 \r
 //++++ DemoLoop();//to be defined in 16_tail\r
 \r
-//++++ Quit("Demo loop exited???");\r
+//++++ Quit(gvar, "Demo loop exited???");\r
 \r
 }\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..d55ac7f0d01e2e1739a11db83a04f252e6c4d8cc 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -36,7 +36,7 @@ loaded into the data segment
 #pragma warn -pro\r
 #pragma warn -use\r
 \r
-//#define THREEBYTEGRSTARTS\r
+#define THREEBYTEGRSTARTS\r
 //https://github.com/open-watcom/open-watcom-v2/issues/279#issuecomment-244587566 for _seg\r
 //http://www.shikadi.net/moddingwiki/GameMaps_Format for info on the code\r
 /*\r
@@ -121,9 +121,9 @@ huffnode    audiohuffman[255];
 int                    grhandle;               // handle to EGAGRAPH\r
 int                    maphandle;              // handle to MAPTEMP / GAMEMAPS\r
 int                    audiohandle;    // handle to AUDIOT / AUDIO\r
-\r
-long           c hunkcomplen,c hunkexplen;\r
-\r
+*/\r
+long           chunkcomplen,chunkexplen;\r
+/*\r
 SDMode         oldsoundmode;\r
 \r
 \r
@@ -138,14 +138,14 @@ void      CAL_CarmackExpand (unsigned far *source, unsigned far *dest,
 #ifdef THREEBYTEGRSTARTS\r
 #define FILEPOSSIZE    3\r
 //#define      GRFILEPOS(c) (*(long far *)(((byte far *)grstarts)+(c)*3)&0xffffff)\r
-long GRFILEPOS(int c, global_game_variables_t *gvar)\r
+CASVT GRFILEPOS(int c, global_game_variables_t *gvar)\r
 {\r
-       long value;\r
+       CASVT value;\r
        int     offset;\r
 \r
        offset = c*3;\r
 \r
-       value = *(long far *)(((byte far *)gvar->ca.grstarts)+offset);\r
+       value = *(CASVT far *)(((byte far *)gvar->ca.grstarts)+offset);\r
 \r
        value &= 0x00ffffffl;\r
 \r
@@ -156,7 +156,11 @@ long GRFILEPOS(int c, global_game_variables_t *gvar)
 };\r
 #else\r
 #define FILEPOSSIZE    4\r
-#define        GRFILEPOS(c) (gvar->ca.grstarts[c])\r
+//#define      GRFILEPOS(c) (gvar->ca.grstarts[c])\r
+CASVT GRFILEPOS(int c, global_game_variables_t *gvar)\r
+{\r
+       return gvar->ca.grstarts[c];\r
+}\r
 #endif\r
 \r
 /*\r
@@ -208,9 +212,9 @@ void CA_CloseDebug(global_game_variables_t *gvar)
 \r
 void CAL_GetGrChunkLength (int chunk,global_game_variables_t *gvar)\r
 {\r
-       lseek(gvar->ca.file.grhandle,GRFILEPOS(chunk),SEEK_SET);\r
+       lseek(gvar->ca.file.grhandle,GRFILEPOS(chunk,gvar),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
+       gvar->ca.chunkcomplen = GRFILEPOS(chunk+1,gvar)-GRFILEPOS(chunk,gvar)-4;\r
 }\r
 \r
 \r
@@ -1069,7 +1073,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,16 +1104,19 @@ 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
+       printf("CAL_SetupGrFile:\n");\r
+       printf("        gvar->ca.chunkcomplen size is %lu\n", gvar->ca.chunkcomplen);\r
+       MM_GetPtr(&compseg,gvar->ca.chunkcomplen,gvar);\r
+       IN_Ack(gvar);\r
        CA_FarRead (gvar->ca.file.grhandle,compseg,gvar->ca.chunkcomplen,gvar);\r
        CAL_HuffExpand (compseg, (byte far *)gvar->video.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
+       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 +1125,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 +1161,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 +1212,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 +1336,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 +1358,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 +1383,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 +1424,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
@@ -1797,15 +1804,15 @@ void CAL_ReadGrChunk (int chunk)
 // load the chunk into a buffer, either the miscbuffer if it fits, or allocate\r
 // a larger buffer\r
 //\r
-       pos = GRFILEPOS(chunk);\r
+       pos = GRFILEPOS(chunk,gvar);\r
        if (pos<0)                                                      // $FFFFFFFF start is a sparse tile\r
          return;\r
 \r
        next = chunk +1;\r
-       while (GRFILEPOS(next) == -1)           // skip past any sparse tiles\r
+       while (GRFILEPOS(next,gvar) == -1)              // skip past any sparse tiles\r
                next++;\r
 \r
-       compressed = GRFILEPOS(next)-pos;\r
+       compressed = GRFILEPOS(next,gvar)-pos;\r
 \r
        lseek(gvar->ca.file.grhandle,pos,SEEK_SET);\r
 \r
@@ -1865,7 +1872,7 @@ void CA_CacheGrChunk (int chunk)
 // load the chunk into a buffer, either the miscbuffer if it fits, or allocate\r
 // a larger buffer\r
 //\r
-       pos = GRFILEPOS(chunk);\r
+       pos = GRFILEPOS(chunk,gvar);\r
        if (pos<0)                                                      // $FFFFFFFF start is a sparse tile\r
          return;\r
 \r
@@ -1873,7 +1880,7 @@ void CA_CacheGrChunk (int chunk)
        while (GRFILEPOS(next) == -1)           // skip past any sparse tiles\r
                next++;\r
 \r
-       compressed = GRFILEPOS(next)-pos;\r
+       compressed = GRFILEPOS(next,gvar)-pos;\r
 \r
        lseek(gvar->ca.file.grhandle,pos,SEEK_SET);\r
 \r
@@ -1945,12 +1952,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 +1975,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
@@ -2352,7 +2359,7 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
                        if (dialog && updatecachebox)\r
                                updatecachebox ();\r
 \r
-                       pos = GRFILEPOS(i);\r
+                       pos = GRFILEPOS(i,gvar);\r
                        if (pos<0)\r
                                continue;\r
 \r
@@ -2360,7 +2367,7 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
                        while (GRFILEPOS(next) == -1)           // skip past any sparse tiles\r
                                next++;\r
 \r
-                       compressed = GRFILEPOS(next)-pos;\r
+                       compressed = GRFILEPOS(next,gvar)-pos;\r
                        endpos = pos+compressed;\r
 \r
                        if (compressed<=BUFFERSIZE)\r
@@ -2383,10 +2390,10 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
                                                if (next == NUMCHUNKS)\r
                                                        continue;\r
 \r
-                                               nextpos = GRFILEPOS(next);\r
-                                               while (GRFILEPOS(++next) == -1) // skip past any sparse tiles\r
+                                               nextpos = GRFILEPOS(next,gvar);\r
+                                               while (GRFILEPOS(++next,gvar) == -1)    // skip past any sparse tiles\r
                                                        ;\r
-                                               nextendpos = GRFILEPOS(next);\r
+                                               nextendpos = GRFILEPOS(next,gvar);\r
                                                if (nextpos - endpos <= MAXEMPTYREAD\r
                                                && nextendpos-pos <= BUFFERSIZE)\r
                                                        endpos = nextendpos;\r

diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
index 295b7146b9d96abea20ad1a38d0905dd19b5f36d..31666821ca2e8cd53b29301b2f50137c17cdafab 100755 (executable)
--- a/src/lib/16_dbg.h
+++ b/src/lib/16_dbg.h
@@ -12,7 +12,7 @@
 //#define __DEBUG_2__\r
 //#define __DEBUG_CA__\r
 //#define __DEBUG_PM__\r
-//#define __DEBUG_MM__\r
+#define __DEBUG_MM__\r
 //#define __DEBUG_RF__\r
 #define __DEBUG_SPRI__\r
 \r

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index d43432fe61707e682132b1efdf1d8c2bd70e9783..b6d2a26743327cbd250e565f91fbe225b9f33fa5 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -936,13 +936,14 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
        gvar->mm.mmnew->useptr = baseptr;\r
        //if(gvar->mm.mmnew->useptr==NULL){\r
 #ifdef __DEBUG_MM__\r
+       printf("MM_GetPtr\n");\r
        if(dbg_debugmm>0){\r
-               printf("MM_GetPtr\n");\r
                //%04x\r
                printf("        baseptr=%Fp     ", baseptr); printf("useptr=%Fp\n", gvar->mm.mmnew->useptr);\r
                printf("        *baseptr=%Fp    ", *baseptr); printf("*useptr=%Fp\n", *(gvar->mm.mmnew->useptr));\r
                printf("        &baseptr=%Fp    ", &baseptr); printf("&useptr=%Fp\n", &(gvar->mm.mmnew->useptr));\r
        }\r
+       printf("        size is %lu\n", size);\r
 #endif\r
        //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); }\r
        gvar->mm.mmnew->attributes = BASEATTRIBUTES;\r

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index f890a3bb4faa21bce17f92adda6621e6fae45dfe..c5e89a2b2869eaac574c18e4dc4e09612e0bc4f8 100755 (executable)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -29,7 +29,7 @@
 #ifdef __DEBUG__               // 1 == Debug/Dev  ;  0 == Production/final\r
 #define OUT_OF_MEM_MSG "MM_GetPtr: Out of memory!\nYou were short :%lu bytes\n"\r
 #else\r
-#define OUT_OF_MEM_MSG "\npee\n"\r
+#define OUT_OF_MEM_MSG "\n"\r
 #endif\r
 \r
 //#define GETNEWBLOCK {if(!(mmnew=mmfree))Quit("MM_GETNEWBLOCK: No free blocks!") ;mmfree=mmfree->next;}\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/16_tdef.h b/src/lib/16_tdef.h
index f45195d698b9a93d9336987d3ed69157b18a4a1e..1aa8b53fc3b0252aae008fb0267824a41c16f340 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -660,9 +660,10 @@ typedef struct
 \r
 #define NUMMAPS                4//39\r
 #define NUMSNDCHUNKS           4//3\r
-//#define NUMPICS              132//wolf3d wl6\r
+//#define NUMPICS              4//132//wolf3d wl6\r
 \r
 #define STRUCTPIC      0\r
+#define CASVT          dword   //*start var type\r
 \r
 \r
 #define DATADIR                "data/"\r
@@ -718,8 +719,8 @@ typedef struct      //TODO: USE THIS!!!!
        byte            far             grneeded[NUMCHUNKS];\r
        word            _seg *audiosegs[NUMSNDCHUNKS];//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
+       CASVT           _seg    *grstarts;      // array of offsets in egagraph, -1 for sparse//long\r
+       CASVT           _seg    *audiostarts;   // array of offsets in audio / audiot//long\r
 \r
 #ifdef GRHEADERLINKED\r
        huffnode        *grhuffman;\r
@@ -733,7 +734,7 @@ typedef struct      //TODO: USE THIS!!!!
        huffnode        audiohuffman[255];\r
 #endif\r
 \r
-       long            chunkcomplen,chunkexplen;\r
+       CASVT           chunkcomplen,chunkexplen;//long\r
 \r
        sd_t            sd;\r
        //TODO: extend! and learn from keen/wolf/catacomb's code wwww\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

diff --git a/src/xcroll.c b/src/xcroll.c
index ed02457e7c28ab78389fae4c56f4e2d421813d37..9e968ae5ef7d47dea439277eb7f3c0de3364977d 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -121,9 +121,7 @@ void main(int argc, char *argv[])
        modexFadeOn(4, &gvar.video.palette);\r
 #endif\r
 \r
-       IN_StartAck (&gvar);\r
-       MM_ShowMemory(&gvar);\r
-       while (!IN_CheckAck (&gvar)){}\r
+//     IN_StartAck (&gvar);    MM_ShowMemory(&gvar);   while (!IN_CheckAck (&gvar)){}\r
 #ifdef FADE\r
        modexPalBlack();        //so player will not see loadings~\r
 #endif\r