X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=f894464ea91d6ce0cd70496f4570fcf1f5db135f;hb=c97b854807379d39e5cc97c5c8c4f4390302528d;hp=df1dd7f7fef2222f312f848279042e4963efa9be;hpb=989f287818c93cf9b1ff96c13e66720571210513;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index df1dd7f7..f894464e 100755
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -28,7 +28,7 @@ Primary coder: John Carmack
 
 RELIES ON
 ---------
-Quit (char *error) function
+Quit (global_game_variables_t *gvar, char *error) function
 
 
 WORK TO DO
@@ -285,7 +285,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
 }
 
 /*
@@ -563,7 +563,7 @@ void MML_ShutdownXMS(global_game_variables_t *gvar)
 
 /*void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
 {
-	//huge mmblocktype huge *scan,huge *last;
+	mmblocktype far *scan,far *last;
 	word		segm=1;
 	word	oldend;
 	dword		segmlen;
@@ -716,8 +716,7 @@ void MML_UseSpace(word segstart, dword seglength, global_game_variables_t *gvar)
 
 void MML_ClearBlock(global_game_variables_t *gvar)
 {
-	//huge mmblocktype huge *scan,huge *last;
-	mmblocktype __far *scan;//,far *last;
+	mmblocktype far *scan;//,far *last;
 
 	scan = gvar->mm.mmhead->next;
 
@@ -753,10 +752,8 @@ void MM_Startup(global_game_variables_t *gvar)
 	int i;
 	//dword length,seglength;
 	dword length; word seglength;
-	//huge void huge	*start;
 	void far	*start;
 	word	segstart;//,endfree;
-	//memptr *peeonself;
 
 	if(gvar->mm.mmstarted)
 		MM_Shutdown(gvar);
@@ -782,23 +779,18 @@ void MM_Startup(global_game_variables_t *gvar)
 	gvar->mm.mmnew->length = 0xffff;
 	gvar->mm.mmnew->attributes = LOCKBIT;
 	gvar->mm.mmnew->next = NULL;
-	//gvar->mm.mmnew->useptr = peeonself;
 	gvar->mm.mmrover = gvar->mm.mmhead;
 
-	//printf("		%x\n", peeonself);
-	//printf("		%x\n", *peeonself);
 //
 // get all available near conventional memory segments
 //
 #ifdef __WATCOMC__
 	_nheapgrow();
 	length=(dword)_memavl();//(dword)GetFreeSize();
-	//huge start = (void huge *)(gvar->mm.nearheap = _nmalloc(length));
 	start = (void far *)(gvar->mm.nearheap = _nmalloc(length));
 #endif
 #ifdef __BORLANDC__
 	length=coreleft();
-	//huge start = (void huge *)(gvar->mm.nearheap = malloc(length));
 	start = (void far *)(gvar->mm.nearheap = malloc(length));
 #endif
 	length -= 16-(FP_OFF(start)&15);
@@ -934,7 +926,6 @@ void MM_Shutdown(global_game_variables_t *gvar)
 
 void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
 {
-	//huge mmblocktype huge *scan,huge *lastscan,huge *endscan,huge *purge,huge *next;
 	mmblocktype far *scan,far *lastscan,far *endscan,far *purge,far *next;
 	int			search;
 	unsigned	needed,startseg;
@@ -1053,7 +1044,6 @@ void MM_GetPtr (memptr *baseptr, dword size, global_game_variables_t *gvar)
 
 void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar)
 {
-	//huge mmblocktype huge *scan,huge *last;
 	mmblocktype far *scan,far *last;
 
 	last = gvar->mm.mmhead;
@@ -1093,7 +1083,6 @@ void MM_FreePtr(memptr *baseptr, global_game_variables_t *gvar)
 
 void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar)
 {
-	//huge mmblocktype huge *start;
 	mmblocktype far *start;
 
 	start = gvar->mm.mmrover;
@@ -1109,7 +1098,7 @@ void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar)
 			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!");
 			//return;
 		}
 
@@ -1133,7 +1122,6 @@ void MM_SetPurge(memptr *baseptr, int purge, global_game_variables_t *gvar)
 
 void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar)
 {
-	//huge mmblocktype huge *start;
 	mmblocktype far *start;
 
 	start = gvar->mm.mmrover;
@@ -1149,7 +1137,7 @@ void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar)
 			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!");
 			//return;
 		}
 
@@ -1173,7 +1161,6 @@ void MM_SetLock(memptr *baseptr, boolean locked, global_game_variables_t *gvar)
 
 void MM_SortMem(global_game_variables_t *gvar)
 {
-	//huge mmblocktype huge *scan,huge *last,huge *next;
 	mmblocktype far *scan,far *last,far *next;
 	unsigned	start,length,source,dest;//++++,oldborder;
 	//++++int			playing;
@@ -1284,7 +1271,6 @@ void MM_SortMem(global_game_variables_t *gvar)
 
 void MM_ShowMemory(global_game_variables_t *gvar)
 {
-	//huge mmblocktype huge *scan;
 	mmblocktype far *scan;
 	//word temp;
 	sdword	end,owner;
@@ -1447,7 +1433,6 @@ void MM_ShowMemory(global_game_variables_t *gvar)
 
 void MM_DumpData(global_game_variables_t *gvar)
 {
-	//huge mmblocktype huge *scan,huge *best;
 	mmblocktype far *scan,far *best;
 	long	lowest,oldlowest;
 	word	owner;
@@ -1522,7 +1507,6 @@ void MM_DumpData(global_game_variables_t *gvar)
 dword MM_UnusedMemory(global_game_variables_t *gvar)
 {
 	dword free;
-	//huge mmblocktype huge *scan;
 	mmblocktype far *scan;
 
 	free = 0;
@@ -1554,7 +1538,6 @@ dword MM_UnusedMemory(global_game_variables_t *gvar)
 dword MM_TotalFree(global_game_variables_t *gvar)
 {
 	dword free;
-	//huge mmblocktype huge *scan;
 	mmblocktype far *scan;
 
 	free = 0;