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

diff --git a/makefile b/makefile
index 575e318f43b33078e2b0a6e88c73c7b9e8062e5d..5c21b2ad782cbf256212191df6b5a115e5543cae 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -119,7 +119,7 @@ UPXQ=-qqq
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdp -zff -zgf -k32768#24576
+S_FLAGS=-sg -st -of+ -zu -zdf -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 eb64dde7a63546dea3853e23fc42a472a8b7f8c8..7f22e1b6eafaeea9188a52557a52ba27e0114b6e 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(gvar, "Demo loop exited???");\r
+//++++ Quit("Demo loop exited???");\r
 \r
 }\r

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index ccab39ba8c97e10a7b11703e903d5522ac6f207e..64c6674a9be661d57e6ca73a14fa5b8b116c13d9 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           chunkcomplen,chunkexplen;\r
-/*\r
+\r
+long           c hunkcomplen,c hunkexplen;\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
-CASVT GRFILEPOS(int c, global_game_variables_t *gvar)\r
+long GRFILEPOS(int c, global_game_variables_t *gvar)\r
 {\r
-       CASVT value;\r
+       long value;\r
        int     offset;\r
 \r
        offset = c*3;\r
 \r
-       value = *(CASVT far *)(((byte far *)gvar->ca.grstarts)+offset);\r
+       value = *(long far *)(((byte far *)gvar->ca.grstarts)+offset);\r
 \r
        value &= 0x00ffffffl;\r
 \r
@@ -156,11 +156,7 @@ CASVT GRFILEPOS(int c, global_game_variables_t *gvar)
 };\r
 #else\r
 #define FILEPOSSIZE    4\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
+#define        GRFILEPOS(c) (gvar->ca.grstarts[c])\r
 #endif\r
 \r
 /*\r
@@ -212,9 +208,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,gvar),SEEK_SET);\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,gvar)-GRFILEPOS(chunk,gvar)-4;\r
+       gvar->ca.chunkcomplen = GRFILEPOS(chunk+1)-GRFILEPOS(chunk)-4;\r
 }\r
 \r
 \r
@@ -1108,10 +1104,7 @@ void CAL_SetupGrFile (global_game_variables_t *gvar)
 #if NUMPICS>0\r
        MM_GetPtr(MEMPTRCONV gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar);\r
        CAL_GetGrChunkLength(STRUCTPIC,gvar);           // position file pointer\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
+       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 *)gvar->video.pictable,NUMPICS*sizeof(pictabletype),gvar->ca.grhuffman);\r
        MM_FreePtr(&compseg,gvar);\r
@@ -1182,11 +1175,11 @@ void CAL_SetupMapFile (global_game_variables_t *gvar)
 /*#ifdef MAPHEADERLINKED\r
        if ((maphandle = open("GAMEMAPS.16"ENSION,\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-               Quit (gvar, "Can't open GAMEMAPS.16"ENSION"!");\r
+               Quit ("Can't open GAMEMAPS.16"ENSION"!");\r
 #else\r
        if ((maphandle = open("MAPTEMP.16"ENSION,\r
                 O_RDONLY | O_BINARY, S_IREAD)) == -1)\r
-               Quit (gvar, "Can't open MAPTEMP.16"ENSION"!");\r
+               Quit ("Can't open MAPTEMP.16"ENSION"!");\r
 #endif*/\r
 }\r
 \r
@@ -1806,15 +1799,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,gvar);\r
+       pos = GRFILEPOS(chunk);\r
        if (pos<0)                                                      // $FFFFFFFF start is a sparse tile\r
          return;\r
 \r
        next = chunk +1;\r
-       while (GRFILEPOS(next,gvar) == -1)              // skip past any sparse tiles\r
+       while (GRFILEPOS(next) == -1)           // skip past any sparse tiles\r
                next++;\r
 \r
-       compressed = GRFILEPOS(next,gvar)-pos;\r
+       compressed = GRFILEPOS(next)-pos;\r
 \r
        lseek(gvar->ca.file.grhandle,pos,SEEK_SET);\r
 \r
@@ -1874,7 +1867,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,gvar);\r
+       pos = GRFILEPOS(chunk);\r
        if (pos<0)                                                      // $FFFFFFFF start is a sparse tile\r
          return;\r
 \r
@@ -1882,7 +1875,7 @@ void CA_CacheGrChunk (int chunk)
        while (GRFILEPOS(next) == -1)           // skip past any sparse tiles\r
                next++;\r
 \r
-       compressed = GRFILEPOS(next,gvar)-pos;\r
+       compressed = GRFILEPOS(next)-pos;\r
 \r
        lseek(gvar->ca.file.grhandle,pos,SEEK_SET);\r
 \r
@@ -2361,7 +2354,7 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
                        if (dialog && updatecachebox)\r
                                updatecachebox ();\r
 \r
-                       pos = GRFILEPOS(i,gvar);\r
+                       pos = GRFILEPOS(i);\r
                        if (pos<0)\r
                                continue;\r
 \r
@@ -2369,7 +2362,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,gvar)-pos;\r
+                       compressed = GRFILEPOS(next)-pos;\r
                        endpos = pos+compressed;\r
 \r
                        if (compressed<=BUFFERSIZE)\r
@@ -2392,10 +2385,10 @@ void CAL_CacheMarks (char *title, global_game_variables_t *gvar)
                                                if (next == NUMCHUNKS)\r
                                                        continue;\r
 \r
-                                               nextpos = GRFILEPOS(next,gvar);\r
-                                               while (GRFILEPOS(++next,gvar) == -1)    // skip past any sparse tiles\r
+                                               nextpos = GRFILEPOS(next);\r
+                                               while (GRFILEPOS(++next) == -1) // skip past any sparse tiles\r
                                                        ;\r
-                                               nextendpos = GRFILEPOS(next,gvar);\r
+                                               nextendpos = GRFILEPOS(next);\r
                                                if (nextpos - endpos <= MAXEMPTYREAD\r
                                                && nextendpos-pos <= BUFFERSIZE)\r
                                                        endpos = nextendpos;\r

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index b6636ddff4aa36cda45bda35902667a50461c32a..7fe1110df998e96ff457d5f9151c402236623881 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -32,7 +32,7 @@ Primary coder: John Carmack
 \r
 RELIES ON\r
 ---------\r
-Quit (gvar, global_game_variables_t *gvar, char *error) function\r
+Quit (global_game_variables_t *gvar, char *error) function\r
 \r
 \r
 WORK TO DO\r
@@ -58,37 +58,6 @@ Open Watcom port by sparky4
 #pragma warn -pro\r
 #pragma warn -use\r
 \r
-/*\r
-=============================================================================\r
-\r
-                                                       LOCAL INFO\r
-\r
-=============================================================================\r
-*/\r
-\r
-#define LOCKBIT                0x80    // if set in attributes, block cannot be moved\r
-#define PURGEBITS      3               // 0-3 level, 0= unpurgable, 3= purge first\r
-#define PURGEMASK      0xfffc\r
-#define BASEATTRIBUTES 0       // unlocked, non purgable\r
-\r
-//#define MAXUMBS              10\r
-\r
-/*typedef struct mmblockstruct\r
-{\r
-       unsigned        start,length;\r
-       unsigned        attributes;\r
-       memptr          *useptr;        // pointer to the segment start\r
-       struct mmblockstruct far *next;\r
-} mmblocktype;*/\r
-\r
-\r
-//#define GETNEWBLOCK {if(!(mmnew=mmfree))Quit("MM_GETNEWBLOCK: No free blocks!") ;mmfree=mmfree->next;}\r
-//\r
-\r
-#define GETNEWBLOCK {if(!gvar->mm.mmfree)MML_ClearBlock(gvar);gvar->mm.mmnew=gvar->mm.mmfree;gvar->mm.mmfree=gvar->mm.mmfree->next;}\r
-\r
-#define FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;}\r
-\r
 /*\r
 =============================================================================\r
 \r
@@ -97,12 +66,9 @@ Open Watcom port by sparky4
 =============================================================================\r
 */\r
 \r
-/*mminfotype   mminfo;\r
-memptr         bufferseg;\r
-boolean                mmerror;*/\r
-\r
 void           (* beforesort) (void);\r
 void           (* aftersort) (void);\r
+void           (* XMSaddr) (void);             // far pointer to XMS driver\r
 \r
 /*\r
 =============================================================================\r
@@ -111,38 +77,6 @@ void                (* aftersort) (void);
 \r
 =============================================================================\r
 */\r
-\r
-/*boolean              mmstarted;\r
-\r
-void far       *farheap;\r
-void           *nearheap;\r
-\r
-mmblocktype    far mmblocks[MAXBLOCKS]\r
-                       ,far *mmhead,far *mmfree,far *mmrover,far *mmnew;\r
-\r
-boolean                bombonerror;*/\r
-\r
-//unsigned     totalEMSpages,freeEMSpages,EMSpageframe,EMSpagesmapped,EMShandle;\r
-\r
-void           (* XMSaddr) (void);             // far pointer to XMS driver\r
-\r
-/*unsigned     numUMBs,UMBbase[MAXUMBS];*/\r
-\r
-//==========================================================================\r
-\r
-//\r
-// local prototypes\r
-//\r
-\r
-boolean                MML_CheckForEMS (void);\r
-void           MML_ShutdownEMS (void);\r
-void           MM_MapEMS (void);\r
-boolean        MML_CheckForXMS (void);\r
-void           MML_ShutdownXMS (void);\r
-//void         MML_UseSpace (unsigned segstart, unsigned seglength);\r
-//void                 MML_ClearBlock (void);\r
-\r
-//==========================================================================\r
 #ifndef __16_PM__\r
 #if 0\r
 static char *ParmStringsexmm[] = {"noems","noxms",""};\r
@@ -694,10 +628,10 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
        }\r
 //++++todo: linked list of segment!\r
 */\r
-void MML_UseSpace (unsigned segstart, unsigned seglength, global_game_variables_t *gvar)\r
+void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)\r
 {\r
        mmblocktype far *scan,far *last;\r
-       unsigned        oldend;\r
+       word    oldend;\r
        sdword          extra;\r
        //word segm=1;\r
 \r
@@ -726,9 +660,8 @@ void MML_UseSpace (unsigned segstart, unsigned seglength, global_game_variables_
 // take the given range out of the block\r
 //\r
        oldend = scan->start + scan->length;\r
-       extra = oldend - (segstart+seglength);\r
+       extra = oldend - (segstart+((unsigned)seglength));\r
        if (extra < 0)\r
-#ifdef __DEBUG_MM__\r
        {\r
                printf("========================================\n");\r
                printf("start=%x        ", scan->start);\r
@@ -742,9 +675,6 @@ void MML_UseSpace (unsigned segstart, unsigned seglength, global_game_variables_
                printf("========================================\n");\r
                //return;\r
        }\r
-#else\r
-               Quit (gvar, "MML_UseSpace: Segment spans two blocks!");\r
-#endif\r
 \r
        if (segstart == scan->start)\r
        {\r
@@ -781,7 +711,7 @@ void MML_UseSpace (unsigned segstart, unsigned seglength, global_game_variables_
 ====================\r
 */\r
 \r
-void MML_ClearBlock (global_game_variables_t *gvar)\r
+void MML_ClearBlock(global_game_variables_t *gvar)\r
 {\r
        mmblocktype far *scan;//,far *last;\r
 \r
@@ -797,7 +727,7 @@ void MML_ClearBlock (global_game_variables_t *gvar)
                scan = scan->next;\r
        }\r
 \r
-       Quit (gvar, "MM_ClearBlock: No purgable blocks!\n");\r
+       printf("MM_ClearBlock: No purgable blocks!\n");\r
 }\r
 \r
 \r
@@ -814,24 +744,26 @@ void MML_ClearBlock (global_game_variables_t *gvar)
 ===================\r
 */\r
 \r
-void MM_Startup (global_game_variables_t *gvar)\r
+void MM_Startup(global_game_variables_t *gvar)\r
 {\r
        int i;\r
-       dword length;\r
+       //dword length,seglength;\r
+       dword length; word seglength;\r
        void far        *start;\r
-       unsigned        segstart,seglength;//,endfree;\r
+       word    segstart;//,endfree;\r
 \r
        if(gvar->mm.mmstarted)\r
-               MM_Shutdown (gvar);\r
+               MM_Shutdown(gvar);\r
 \r
        gvar->mm.mmstarted = true;\r
        gvar->mm.bombonerror = true;\r
+\r
 //\r
 // set up the linked list (everything in the free list;\r
 //\r
        gvar->mm.mmhead = NULL;\r
        gvar->mm.mmfree = &(gvar->mm.mmblocks[0]);\r
-       for (i=0;i<MAXBLOCKS-1;i++)\r
+       for(i=0;i<MAXBLOCKS-1;i++)\r
                gvar->mm.mmblocks[i].next = &(gvar->mm.mmblocks[i+1]);\r
        gvar->mm.mmblocks[i].next = NULL;\r
 \r
@@ -846,7 +778,6 @@ void MM_Startup (global_game_variables_t *gvar)
        gvar->mm.mmnew->next = NULL;\r
        gvar->mm.mmrover = gvar->mm.mmhead;\r
 \r
-\r
 //\r
 // get all available near conventional memory segments\r
 //\r
@@ -866,7 +797,7 @@ void MM_Startup (global_game_variables_t *gvar)
        length -= SAVENEARHEAP;\r
        seglength = length / 16;                        // now in paragraphs\r
        segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;\r
-       MML_UseSpace (segstart,seglength, gvar);\r
+       MML_UseSpace(segstart,seglength, gvar);\r
        gvar->mmi.nearheap = length;\r
        //0000printf("near:     start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, (dword)seglength, length);\r
 \r
@@ -887,7 +818,7 @@ void MM_Startup (global_game_variables_t *gvar)
        length -= SAVEFARHEAP;\r
        seglength = length / 16;                        // now in paragraphs\r
        segstart = FP_SEG(start)+(FP_OFF(start)+15)/16;\r
-       MML_UseSpace (segstart,seglength, gvar);\r
+       MML_UseSpace(segstart,seglength, gvar);\r
        gvar->mmi.farheap = length;\r
        //0000printf("far:      start=%Fp       segstart=%x     seglen=%lu      len=%lu\n", start, segstart, (dword)seglength, length);\r
 \r
@@ -942,7 +873,7 @@ xmsskip:
 //\r
        gvar->mm.mmrover = gvar->mm.mmhead;             // start looking for space after low block\r
 \r
-       MM_GetPtr (&(gvar->mm.bufferseg),BUFFERSIZE, gvar);\r
+       MM_GetPtr(&(gvar->mm.bufferseg),BUFFERSIZE, gvar);\r
 }\r
 \r
 //==========================================================================\r
@@ -957,7 +888,7 @@ xmsskip:
 ====================\r
 */\r
 \r
-void MM_Shutdown (global_game_variables_t *gvar)\r
+void MM_Shutdown(global_game_variables_t *gvar)\r
 {\r
        if(!(gvar->mm.mmstarted))\r
                return;\r
@@ -995,10 +926,10 @@ void MM_Shutdown (global_game_variables_t *gvar)
 ====================\r
 */\r
 \r
-void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar)\r
+void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)\r
 {\r
        mmblocktype far *scan,far *lastscan,far *endscan\r
-                               ,far *purge,far *next;\r
+                                               ,far *purge,far *next;\r
        int                     search;\r
        unsigned        needed,startseg;\r
 \r
@@ -1007,19 +938,18 @@ void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar)
        GETNEWBLOCK;                            // fill in start and next after a spot is found\r
        gvar->mm.mmnew->length = needed;\r
        gvar->mm.mmnew->useptr = baseptr;\r
-       gvar->mm.mmnew->attributes = BASEATTRIBUTES;\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
+       //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); }\r
+       gvar->mm.mmnew->attributes = BASEATTRIBUTES;\r
 \r
 //tryagain:\r
        for (search = 0; search<3; search++)\r
@@ -1097,7 +1027,7 @@ void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar)
                //heapdump();\r
 #endif\r
                printf(OUT_OF_MEM_MSG,(size-gvar->mmi.nearheap));\r
-               Quit (gvar, "for stability reasons the program will shut down! wwww\n");\r
+               Quit(gvar, "for stability reasons the program will shut down! wwww\n");\r
        }\r
        else\r
                gvar->mm.mmerror = true;\r
@@ -1125,13 +1055,13 @@ void MM_FreePtr (memptr *baseptr, global_game_variables_t *gvar)
        if (baseptr == gvar->mm.mmrover->useptr)        // removed the last allocated block\r
                gvar->mm.mmrover = gvar->mm.mmhead;\r
 \r
-       while (scan->useptr != baseptr && scan)\r
+       while(scan->useptr != baseptr && scan)\r
        {\r
                last = scan;\r
                scan = scan->next;\r
        }\r
 \r
-       if (!scan)\r
+       if(!scan)\r
                Quit (gvar, "MM_FreePtr: Block not found!");\r
 \r
        last->next = scan->next;\r
@@ -1168,7 +1098,7 @@ void MM_SetPurge (memptr *baseptr, int purge, global_game_variables_t *gvar)
                else if (gvar->mm.mmrover == start)\r
                        Quit (gvar, "MM_SetPurge: Block not found!");\r
 \r
-       } while (1);\r
+       } while(1);\r
 \r
        gvar->mm.mmrover->attributes &= ~PURGEBITS;\r
        gvar->mm.mmrover->attributes |= purge;\r
@@ -1243,7 +1173,7 @@ void MM_SortMem (global_game_variables_t *gvar)
                        playing += STARTADLIBSOUNDS;\r
                        break;\r
                }\r
-               MM_SetLock(MEMPTRCONV audiosegs[playing],true);\r
+               MM_SetLock((memptr *)&audiosegs[playing],true);\r
        }\r
 \r
 \r
@@ -1251,16 +1181,16 @@ void MM_SortMem (global_game_variables_t *gvar)
        oldborder = gvar->video.bordercolor;\r
        gvar->video.bordercolor = modexPalOverscan(15);\r
 \r
-       if (beforesort)\r
+       if(beforesort)\r
                beforesort();\r
 \r
        scan = gvar->mm.mmhead;\r
 \r
        last = NULL;            // shut up compiler warning\r
 \r
-       while (scan)\r
+       while(scan)\r
        {\r
-               if (scan->attributes & LOCKBIT)\r
+               if(scan->attributes & LOCKBIT)\r
                {\r
                //\r
                // block is locked, so try to pile later blocks right after it\r
@@ -1269,7 +1199,7 @@ void MM_SortMem (global_game_variables_t *gvar)
                }\r
                else\r
                {\r
-                       if (scan->attributes & PURGEBITS)\r
+                       if(scan->attributes & PURGEBITS)\r
                        {\r
                        //\r
                        // throw out the purgable block\r
@@ -1285,12 +1215,12 @@ void MM_SortMem (global_game_variables_t *gvar)
                        //\r
                        // push the non purgable block on top of the last moved block\r
                        //\r
-                               if (scan->start != start)\r
+                               if(scan->start != start)\r
                                {\r
                                        length = scan->length;\r
                                        source = scan->start;\r
                                        dest = start;\r
-                                       while (length > 0xf00)\r
+                                       while(length > 0xf00)\r
                                        {\r
                                                movedata(source,0,dest,0,0xf00*16);\r
                                                length -= 0xf00;\r
@@ -1312,7 +1242,7 @@ void MM_SortMem (global_game_variables_t *gvar)
 \r
        gvar->mm.mmrover = gvar->mm.mmhead;\r
 \r
-       if (aftersort)\r
+       if(aftersort)\r
                aftersort();\r
 \r
        VL_ColorBorder (oldborder, &gvar->video);\r

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 4516571d4f4492ef43ae7cea00b6c7c6f354cb32..86bcdd575ef1b923134890136422873d5e7a3e70 100755 (executable)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -41,8 +41,8 @@
 \r
 #define FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;}\r
 \r
-#define SAVENEARHEAP   0x400           // space to leave in data segment\r
-#define SAVEFARHEAP    0                       // space to leave in far heap\r
+#define SAVENEARHEAP   0x200           // space to leave in data segment\r
+#define SAVEFARHEAP    0x400                   // space to leave in far heap\r
 \r
 #define        BUFFERSIZE              0x1000          // miscelanious, allways available buffer\r
 \r
@@ -106,7 +106,7 @@
 \r
 extern void            (* beforesort) (void);\r
 extern void            (* aftersort) (void);\r
-//extern       void            (* XMSaddr) (void);             // far pointer to XMS driver\r
+extern void            (* XMSaddr) (void);             // far pointer to XMS driver\r
 extern dword   XMSDriver;\r
 extern word            XMSVer;\r
 \r
@@ -187,8 +187,8 @@ boolean MML_CheckForEMS(void);
 boolean MML_CheckForXMS(void);\r
 //void MML_SetupXMS(mminfo_t *mm, mminfotype *mmi);\r
 //void MML_ShutdownXMS(mminfo_t *mm);\r
- void MML_UseSpace (unsigned segstart, unsigned seglength, global_game_variables_t *gvar);\r
- void MML_ClearBlock (global_game_variables_t *gvar);\r
+void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar);\r
+void MML_ClearBlock (global_game_variables_t *gvar);\r
 \r
 void MM_Startup(global_game_variables_t *gvar);\r
 void MM_Shutdown(global_game_variables_t *gvar);\r

diff --git a/src/lib/16_pm.c b/src/lib/16_pm.c
index ce81eb4a4798071259f92d91737361bf955b7321..858bd4b9fe121208edf5393ae64f714c4596978a 100755 (executable)
--- a/src/lib/16_pm.c
+++ b/src/lib/16_pm.c
@@ -1420,7 +1420,7 @@ PM_NextFrame(global_game_variables_t *gvar)
                {\r
                        char buf[40];\r
                        sprintf(buf,"PM_NextFrame: Page %d is locked",i);\r
-                       Quit (gvar, buf);\r
+                       Quit(gvar, buf);\r
                }\r
        }\r
 //#endif\r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 3fa1feb335ced492a655faf2c2195e411e338469..f45195d698b9a93d9336987d3ed69157b18a4a1e 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -468,11 +468,14 @@ typedef struct
 //from 16_mm\r
 //==========================================================================\r
 \r
-#define MAXBLOCKS              800//kd=1300 wolf3d=700 cata=600\r
+#define MAXBLOCKS              1024//kd=1300 wolf3d=700 cata=600\r
+//----#define MAXUMBS          12\r
 \r
 typedef struct mmblockstruct\r
 {\r
-       unsigned        start,length;\r
+       word    start,length;\r
+       //word  start;  dword length;\r
+//++++ word    blob;   //for data larger than 64k\r
        unsigned        attributes;\r
        memptr          *useptr;        // pointer to the segment start\r
        struct mmblockstruct far *next;\r
@@ -657,10 +660,9 @@ typedef struct
 \r
 #define NUMMAPS                4//39\r
 #define NUMSNDCHUNKS           4//3\r
-//#define NUMPICS              4//132//wolf3d wl6\r
+//#define NUMPICS              132//wolf3d wl6\r
 \r
 #define STRUCTPIC      0\r
-#define CASVT          dword   //*start var type\r
 \r
 \r
 #define DATADIR                "data/"\r
@@ -716,8 +718,8 @@ typedef struct      //TODO: USE THIS!!!!
        byte            far             grneeded[NUMCHUNKS];\r
        word            _seg *audiosegs[NUMSNDCHUNKS];//long\r
 \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
+       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
 #ifdef GRHEADERLINKED\r
        huffnode        *grhuffman;\r
@@ -731,7 +733,7 @@ typedef struct      //TODO: USE THIS!!!!
        huffnode        audiohuffman[255];\r
 #endif\r
 \r
-       CASVT           chunkcomplen,chunkexplen;//long\r
+       long            chunkcomplen,chunkexplen;\r
 \r
        sd_t            sd;\r
        //TODO: extend! and learn from keen/wolf/catacomb's code wwww\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 638c985bf9cf640e2dfc70dda473ca4f6fbfca31..059ad77f65a48b9501eca26c0d4811960ada9e54 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 638c985bf9cf640e2dfc70dda473ca4f6fbfca31
+Subproject commit 059ad77f65a48b9501eca26c0d4811960ada9e54

diff --git a/src/sountest.c b/src/sountest.c
index 94d2f25432c6f8c0d3827153b7c55033b452f4ca..d15a5462fbab440514c02917f1c15c269628e0d5 100755 (executable)
--- a/src/sountest.c
+++ b/src/sountest.c
@@ -70,7 +70,7 @@ void main(int argc, char near *argv[])
        //FMSetVoice(0, &testInst);\r
        if(!init_adlib())\r
        {\r
-               Quit (&gvar, "Cannot init library");\r
+               Quit(&gvar, "Cannot init library");\r
        }\r
 \r
        if (adlib_fm_voices > 9)\r

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