X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=df1dd7f7fef2222f312f848279042e4963efa9be;hb=330b72f5c3a57ed0a17636059df12e0195a5c3cd;hp=3422903323d7482c274e7dd0f71053fdb583334d;hpb=a4d644c938b7c09f23cdbee5b42a3b524f781a41;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 34229033..df1dd7f7 100755
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -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
@@ -439,6 +439,7 @@ byte MM_MapXEMS(global_game_variables_t *gvar)
 
 boolean MML_CheckForXMS(void)
 {
+	//numUMBs = 0;
 	boolean	errorflag=false;
 
 	__asm {
@@ -716,7 +717,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;
 
@@ -769,9 +770,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;
 
 //
@@ -842,23 +841,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 +863,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())
@@ -1204,8 +1175,8 @@ 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
@@ -1315,18 +1286,18 @@ 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;