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 c14632abb93014c2d9ce3057ad480a4f542e5f77..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 (char *error) function\r
+Quit (gvar, global_game_variables_t *gvar, char *error) function\r
 \r
 \r
 WORK TO DO\r
@@ -389,7 +389,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
@@ -743,7 +743,7 @@ void MML_UseSpace (unsigned segstart, unsigned seglength, global_game_variables_
                //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
@@ -797,7 +797,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
@@ -1019,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
@@ -1097,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("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
@@ -1132,7 +1132,7 @@ void MM_FreePtr (memptr *baseptr, global_game_variables_t *gvar)
        }\r
 \r
        if (!scan)\r
-               Quit ("MM_FreePtr: Block not found!");\r
+               Quit (gvar, "MM_FreePtr: Block not found!");\r
 \r
        last->next = scan->next;\r
 \r
@@ -1166,7 +1166,7 @@ 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
 \r
@@ -1202,7 +1202,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
@@ -1385,7 +1385,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