broke fuck

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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index c14632abb93014c2d9ce3057ad480a4f542e5f77..f2392b6acd26f61825c1abda6d776870cbbfbf1e 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 (char *error) function\r
+Quit (global_game_variables_t *gvar, char *error) function\r
 \r
 \r
 WORK TO DO\r
@@ -58,6 +58,7 @@ Open Watcom port by sparky4
 #pragma warn -pro\r
 #pragma warn -use\r
 \r
+\r
 /*\r
 =============================================================================\r
 \r
@@ -66,10 +67,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
@@ -85,9 +86,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
@@ -389,7 +390,7 @@ void MML_ShutdownEMS(global_game_variables_t *gvar)
        }\r
 #endif\r
        if(errorflag==true)\r
-               Quit ("MML_ShutdownEMS: Error freeing EMS!\n"); //++++ add something\r
+               Quit (gvar, "MML_ShutdownEMS: Error freeing EMS!\n");   //++++ add something\r
 }\r
 \r
 /*\r
@@ -620,7 +621,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
@@ -679,7 +680,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
@@ -694,10 +695,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, word 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
@@ -797,7 +798,7 @@ void MML_ClearBlock (global_game_variables_t *gvar)
                scan = scan->next;\r
        }\r
 \r
-       Quit ("MM_ClearBlock: No purgable blocks!\n");\r
+       Quit (gvar, "MM_ClearBlock: No purgable blocks!\n");\r
 }\r
 \r
 \r
@@ -819,13 +820,14 @@ void MM_Startup (global_game_variables_t *gvar)
        int i;\r
        dword length;\r
        void far        *start;\r
-       unsigned        segstart,seglength;//,endfree;\r
+       word    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
@@ -910,7 +912,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
@@ -1097,7 +1099,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("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,14 +1127,14 @@ 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
-               Quit ("MM_FreePtr: Block not found!");\r
+       if(!scan)\r
+               Quit (gvar, "MM_FreePtr: Block not found!");\r
 \r
        last->next = scan->next;\r
 \r
@@ -1166,9 +1168,9 @@ void MM_SetPurge (memptr *baseptr, int purge, global_game_variables_t *gvar)
                if (!gvar->mm.mmrover)\r
                        gvar->mm.mmrover = gvar->mm.mmhead;\r
                else if (gvar->mm.mmrover == start)\r
-                       Quit ("MM_SetPurge: Block not found!");\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
@@ -1202,7 +1204,7 @@ void MM_SetLock (memptr *baseptr, boolean locked, global_game_variables_t *gvar)
                if (!gvar->mm.mmrover)\r
                        gvar->mm.mmrover = gvar->mm.mmhead;\r
                else if (gvar->mm.mmrover == start)\r
-                       Quit ("MM_SetLock: Block not found!");\r
+                       Quit (gvar, "MM_SetLock: Block not found!");\r
 \r
        } while(1);\r
 \r
@@ -1243,7 +1245,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 +1253,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 +1271,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 +1287,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 +1314,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
@@ -1385,7 +1387,7 @@ void MM_ShowMemory (global_game_variables_t *gvar)
                        ultoa (scan->start,str,10);\r
                        strcat (scratch,str);\r
                        write(gvar->handle.debughandle,scratch,strlen(scratch));\r
-                       Quit ("MM_ShowMemory: Memory block order currupted!");\r
+                       Quit (gvar, "MM_ShowMemory: Memory block order currupted!");\r
                }\r
                end = scan->length-1;\r
                y = scan->start/width;\r