X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=df1dd7f7fef2222f312f848279042e4963efa9be;hb=704ec571885c6255ead65280428ad72510cfe218;hp=90b7ebef8984b602785e4725a3c69ffa08cb51b6;hpb=a5e754f72b0925b0b9a65414e8369ab75f440918;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 90b7ebef..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;
 
 //
@@ -1176,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
@@ -1287,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;