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

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 9a4ae187..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
@@ -72,9 +72,9 @@ void		(* XMSaddr) (void);		// far pointer to XMS driver
 
 =============================================================================
 */
-
+#ifndef __16_PM__
 static	char *ParmStringsexmm[] = {"noems","noxms",""};
-
+#endif
 /*
 ======================
 =
@@ -87,7 +87,7 @@ static	char *ParmStringsexmm[] = {"noems","noxms",""};
 
 boolean MML_CheckForEMS(void)
 {
-	boolean emmcfems;
+	boolean emmcfems=0;
 	static char	emmname[] = "EMMXXXX0";	//fix by andrius4669
 	__asm {
 		mov	dx,OFFSET emmname	//fix by andrius4669
@@ -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
 }
 
 /*
@@ -439,6 +439,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
 
 boolean MML_CheckForXMS(void)
 {
+	//numUMBs = 0;
 	boolean	errorflag=false;
 
 	__asm {
@@ -562,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;
@@ -715,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;
 
@@ -752,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);
@@ -769,9 +767,7 @@ void MM_Startup(global_game_variables_t *gvar)
 	gvar->mm.mmhead = NULL;
 	gvar->mm.mmfree = &(gvar->mm.mmblocks[0]);
 	for(i=0;i<MAXBLOCKS-1;i++)
-	{
 		gvar->mm.mmblocks[i].next = &(gvar->mm.mmblocks[i+1]);
-	}
 	gvar->mm.mmblocks[i].next = NULL;
 
 //
@@ -783,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);
@@ -842,23 +833,9 @@ void MM_Startup(global_game_variables_t *gvar)
 //
 	gvar->mmi.EMSmem = 0;
 //goto emsskip;	//0000
-	for(i = 1;i <
-#ifdef __WATCOMC__
-	__argc
-#endif
-#ifdef __BORLANDC__
-	_argc
-#endif
-	;i++)
+	for(i = 1;i < _argc;i++)
 	{
-		if(US_CheckParm(
-#ifdef __WATCOMC__
-	__argv[i]
-#endif
-#ifdef __BORLANDC__
-	_argv[i]
-#endif
-			,ParmStringsexmm) == 0)
+		if(US_CheckParm(_argv[i],ParmStringsexmm) == 0)
 			goto emsskip;				// param NOEMS
 	}
 	if(MML_CheckForEMS())
@@ -878,23 +855,9 @@ void MM_Startup(global_game_variables_t *gvar)
 emsskip:
 	gvar->mmi.XMSmem = 0;
 goto xmsskip;//0000
-	for(i = 1;i <
-#ifdef __WATCOMC__
-	__argc
-#endif
-#ifdef __BORLANDC__
-	_argc
-#endif
-	;i++)
+	for(i = 1;i < _argc;i++)
 	{
-		if(US_CheckParm(
-#ifdef __WATCOMC__
-	__argv[i]
-#endif
-#ifdef __BORLANDC__
-	_argv[i]
-#endif
-			,ParmStringsexmm) == 0)
+		if(US_CheckParm( _argv[i],ParmStringsexmm) == 0)
 			goto xmsskip;				// param NOXMS
 	}
 	if(MML_CheckForXMS())
@@ -903,11 +866,11 @@ goto xmsskip;//0000
 	}
 
 	}
+xmsskip:
 #endif
 //
 // allocate the misc buffer
 //
-xmsskip:
 	gvar->mm.mmrover = gvar->mm.mmhead;		// start looking for space after low block
 
 	MM_GetPtr(&(gvar->mm.bufferseg),BUFFERSIZE, gvar);
@@ -937,16 +900,16 @@ void MM_Shutdown(global_game_variables_t *gvar)
 #ifdef __BORLANDC__
 	free(gvar->mm.nearheap);//	printf("		near freed\n");
 #endif
+#ifndef __16_PM__
 #ifdef __DEBUG__
 	if(!dbg_debugpm) {
 #endif
-#ifndef __16_PM__
 	if(MML_CheckForEMS()){ MML_ShutdownEMS(gvar); }//printf("		EMS freed\n"); }
 	if(MML_CheckForXMS()){ MML_ShutdownXMS(gvar); }//printf("		XMS freed\n"); }
-#endif
 #ifdef __DEBUG__
 	}
 #endif
+#endif
 }
 
 //==========================================================================
@@ -963,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;
@@ -1082,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;
@@ -1122,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;
@@ -1138,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;
 		}
 
@@ -1162,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;
@@ -1178,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;
 		}
 
@@ -1202,10 +1161,9 @@ 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;
+	unsigned	start,length,source,dest;//++++,oldborder;
+	//++++int			playing;
 
 	//
 	// lock down a currently playing sound
@@ -1313,20 +1271,19 @@ 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;
+	//word temp;
 	sdword	end,owner;
 	//word chx,chy;
 	word w;
 	//dword wwww;
-	byte    scratch[160],scratch0[4096],scratch1[160],str[16];
+	byte    scratch[160],scratch0[4096],str[16];//[[[[scratch1[160],
 	//byte d = '#';
-//****	VW_SetDefaultColors();
-//****	VW_SetLineWidth(40);
+//[[[[	VW_SetDefaultColors();
+//[[[[	VW_SetLineWidth(40);
 //++++mh	temp = bufferofs;
 //++++mh	bufferofs = 0;
-//****	VW_SetScreen (0,0);
+//[[[[	VW_SetScreen (0,0);
 	scan = gvar->mm.mmhead;
 	end = -1;
 
@@ -1476,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;
@@ -1551,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;
@@ -1583,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;
@@ -1627,7 +1581,7 @@ void MM_Report_(global_game_variables_t *gvar)
 	if(MML_CheckForXMS())
 	{
 		printf("	%cXMS	%u\n", 0xC9, gvar->pm.xmm.XMSPresent);
-//++++		printf("		XMS v%x.%x available\n", gvar->pm.xmm.XMSVer>>4,gvar->pm.xmm.XMSVer&0x0F);
+		printf("	%c%cXMS v%x.%x available\n", 0xC7, 0xC4, XMSVer>>8,XMSVer&0x0F);
 		printf("	%c%cXMSDriver:	%Fp\n", 0xC7, 0xC4, XMSDriver);
 		printf("	%c%cXMSHandle:	%04x\n", 0xC7, 0xC4, gvar->pm.xmm.XMSHandle);
 		printf("	%c%cXMSmem:	%lu\n", 0xD3, 0xC4, gvar->mmi.XMSmem);