X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=b6636ddff4aa36cda45bda35902667a50461c32a;hb=767a51ba929d4110350572d014665644fa2288d5;hp=c14632abb93014c2d9ce3057ad480a4f542e5f77;hpb=050d28da3358d5c1434fda542ec11adbee182ea5;p=16.git diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index c14632ab..b6636ddf 100755 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -32,7 +32,7 @@ Primary coder: John Carmack RELIES ON --------- -Quit (char *error) function +Quit (gvar, global_game_variables_t *gvar, char *error) function WORK TO DO @@ -389,7 +389,7 @@ void MML_ShutdownEMS(global_game_variables_t *gvar) } #endif if(errorflag==true) - Quit ("MML_ShutdownEMS: Error freeing EMS!\n"); //++++ add something + Quit (gvar, "MML_ShutdownEMS: Error freeing EMS!\n"); //++++ add something } /* @@ -743,7 +743,7 @@ void MML_UseSpace (unsigned segstart, unsigned seglength, global_game_variables_ //return; } #else - Quit ("MML_UseSpace: Segment spans two blocks!"); + Quit (gvar, "MML_UseSpace: Segment spans two blocks!"); #endif if (segstart == scan->start) @@ -797,7 +797,7 @@ void MML_ClearBlock (global_game_variables_t *gvar) scan = scan->next; } - Quit ("MM_ClearBlock: No purgable blocks!\n"); + Quit (gvar, "MM_ClearBlock: No purgable blocks!\n"); } @@ -1019,7 +1019,7 @@ void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar) } printf(" size is %lu\n", size); #endif - //Quit(gvar, "gvar->mm.mmnew->useptr==NULL"); } + //Quit (gvar, "gvar->mm.mmnew->useptr==NULL"); } //tryagain: for (search = 0; search<3; search++) @@ -1097,7 +1097,7 @@ void MM_GetPtr (memptr *baseptr,dword size, global_game_variables_t *gvar) //heapdump(); #endif printf(OUT_OF_MEM_MSG,(size-gvar->mmi.nearheap)); - Quit("for stability reasons the program will shut down! wwww\n"); + Quit (gvar, "for stability reasons the program will shut down! wwww\n"); } else gvar->mm.mmerror = true; @@ -1132,7 +1132,7 @@ void MM_FreePtr (memptr *baseptr, global_game_variables_t *gvar) } if (!scan) - Quit ("MM_FreePtr: Block not found!"); + Quit (gvar, "MM_FreePtr: Block not found!"); last->next = scan->next; @@ -1166,7 +1166,7 @@ void MM_SetPurge (memptr *baseptr, int purge, global_game_variables_t *gvar) if (!gvar->mm.mmrover) gvar->mm.mmrover = gvar->mm.mmhead; else if (gvar->mm.mmrover == start) - Quit ("MM_SetPurge: Block not found!"); + Quit (gvar, "MM_SetPurge: Block not found!"); } while (1); @@ -1202,7 +1202,7 @@ void MM_SetLock (memptr *baseptr, boolean locked, global_game_variables_t *gvar) if (!gvar->mm.mmrover) gvar->mm.mmrover = gvar->mm.mmhead; else if (gvar->mm.mmrover == start) - Quit ("MM_SetLock: Block not found!"); + Quit (gvar, "MM_SetLock: Block not found!"); } while(1); @@ -1385,7 +1385,7 @@ void MM_ShowMemory (global_game_variables_t *gvar) ultoa (scan->start,str,10); strcat (scratch,str); write(gvar->handle.debughandle,scratch,strlen(scratch)); - Quit ("MM_ShowMemory: Memory block order currupted!"); + Quit (gvar, "MM_ShowMemory: Memory block order currupted!"); } end = scan->length-1; y = scan->start/width;