updating xcrollbroke commit

[16.git] / src / lib / 16_mm.c

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index f2392b6acd26f61825c1abda6d776870cbbfbf1e..b6636ddff4aa36cda45bda35902667a50461c32a 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 (global_game_variables_t *gvar, char *error) function\r
+Quit (gvar, global_game_variables_t *gvar, char *error) function\r
 \r
 \r
 WORK TO DO\r
@@ -58,7 +58,6 @@ Open Watcom port by sparky4
 #pragma warn -pro\r
 #pragma warn -use\r
 \r
-\r
 /*\r
 =============================================================================\r
 \r
@@ -67,10 +66,10 @@ Open Watcom port by sparky4
 =============================================================================\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
+#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
@@ -86,9 +85,9 @@ Open Watcom port by sparky4
 //#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
+#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
+#define FREEBLOCK(x) {*x->useptr=NULL;x->next=gvar->mm.mmfree;gvar->mm.mmfree=x;}\r
 \r
 /*\r
 =============================================================================\r
@@ -621,7 +620,7 @@ getmemory:
        }\r
 #endif\r
 //     printf("base=%u ", base); printf("size=%u\n", size);\r
-       MML_UseSpace (base,size, gvar);\r
+       MML_UseSpace(base,size, gvar);\r
        gvar->mmi.XMSmem += size*16;\r
        gvar->mm.UMBbase[gvar->mm.numUMBs] = base;\r
        gvar->mm.numUMBs++;\r
@@ -680,7 +679,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
        {\r
                scan->blob=segm;\r
 \r
-               //MML_UseSpace (segstart, seglength, gvar);\r
+               //MML_UseSpace(segstart, seglength, gvar);\r
 \r
                printf("MML_UseSpace: Segment spans two blocks!\n");\r
        //}\r
@@ -695,10 +694,10 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
        }\r
 //++++todo: linked list of segment!\r
 */\r
-void MML_UseSpace (word segstart, word seglength, global_game_variables_t *gvar)\r
+void MML_UseSpace (unsigned segstart, unsigned seglength, global_game_variables_t *gvar)\r
 {\r
        mmblocktype far *scan,far *last;\r
-       word    oldend;\r
+       unsigned        oldend;\r
        sdword          extra;\r
        //word segm=1;\r
 \r
@@ -744,7 +743,7 @@ void MML_UseSpace (word segstart, word seglength, global_game_variables_t *gvar)
                //return;\r
        }\r
 #else\r
-               Quit ("MML_UseSpace: Segment spans two blocks!");\r
+               Quit (gvar, "MML_UseSpace: Segment spans two blocks!");\r
 #endif\r
 \r
        if (segstart == scan->start)\r
@@ -820,14 +819,13 @@ void MM_Startup (global_game_variables_t *gvar)
        int i;\r
        dword length;\r
        void far        *start;\r
-       word    segstart,seglength;//,endfree;\r
+       unsigned        segstart,seglength;//,endfree;\r
 \r
        if(gvar->mm.mmstarted)\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
@@ -912,7 +910,7 @@ void MM_Startup (global_game_variables_t *gvar)
        {\r
                MML_SetupEMS(gvar);                                     // allocate space\r
                //16_PM: EMS4! AND EMS 3.2 MASSIVE DATA HANDLMENT!\r
-               MML_UseSpace (gvar->mm.EMSPageFrame,(MAPPAGES)*0x4000lu, gvar);\r
+               MML_UseSpace(gvar->mm.EMSPageFrame,(MAPPAGES)*0x4000lu, gvar);\r
                //if(gvar->pm.emm.EMSVer<0x40)\r
                        MM_MapEMS(gvar);                                        // map in used pages\r
                //else\r
@@ -1021,7 +1019,7 @@ void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar)
        }\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
 \r
 //tryagain:\r
        for (search = 0; search<3; search++)\r
@@ -1099,7 +1097,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
@@ -1127,13 +1125,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
@@ -1170,7 +1168,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
@@ -1245,7 +1243,7 @@ void MM_SortMem (global_game_variables_t *gvar)
                        playing += STARTADLIBSOUNDS;\r
                        break;\r
                }\r
-               MM_SetLock((memptr *)&audiosegs[playing],true);\r
+               MM_SetLock(MEMPTRCONV audiosegs[playing],true);\r
        }\r
 \r
 \r
@@ -1253,16 +1251,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
@@ -1271,7 +1269,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
@@ -1287,12 +1285,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
@@ -1314,7 +1312,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