X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=e2cb1fa2a422dc5c2e399d0885ef6c6d08311b9e;hb=9faff683f275abe93daa14b968af0126a21c50e5;hp=77bbe9638ebec7b051692df765466678f797597d;hpb=c5e2579e86b089548e88b75af850c6315f874b1d;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index 77bbe963..e2cb1fa2 100755
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2023 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -1263,10 +1263,9 @@ void MM_SortMem (global_game_variables_t *gvar)
 
 
 	SD_StopSound();*/
-#ifdef __WATCOMC__
+
 	oldborder = gvar->video.bordercolor;
 	gvar->video.bordercolor = VL_modexPalOverscan(gvar->video.palette, 4);
-#endif
 
 	if (beforesort)
 		beforesort();
@@ -1357,17 +1356,16 @@ extern char global_temp_status_text2[512];
 =====================
 */
 
-
 void MM_ShowMemory (global_game_variables_t *gvar)
 {
 	mmblocktype far *scan;
-	unsigned color,temp,x,y		,w,width,sw;
+	unsigned color,temp,x,y		,q,w/*,width*/,sw;
 	sdword	end,owner;
 	byte		scratch[160],scratch0[4096],str[16];
 #ifdef MMSMSCANINFO
 	mmshowmemoryinfo_t scaninfo[MAXBLOCKS];
 	byte scratch1[4];
-	unsigned		/*xpos,ypos, */oldq,q,maxq;
+	unsigned		/*xpos,ypos, */oldq,maxq;
 	boolean		done,restarted,mmsmscaninfoxyposinew;
 	ScanCode		scancode;
 #endif
@@ -1381,13 +1379,13 @@ void MM_ShowMemory (global_game_variables_t *gvar)
 #ifdef MMSMSCANINFO
 	oldq = 0; restarted = false; mmsmscaninfoxyposinew = false;
 reset:
-	q = 0;
 #endif
 	scan = gvar->mm.mmhead;
 
-	end = -1; w = 0;
+	end = -1; w = 0; q = 0;
 
-	width = gvar->video.page[0].width; sw = gvar->video.page[0].sw;
+	//width = gvar->video.page[0].width;
+	sw = gvar->video.page[0].sw;
 
 	CA_OpenDebug (gvar);
 	while (scan)
@@ -1501,9 +1499,8 @@ reset:
 //0000fprintf(stdout, "[%u]\n", q);
 
 		scan = scan->next;
-#ifdef MMSMSCANINFO
 		q++;
-#endif
+
 //0000if(gvar->video.VL_Started && color!=6) IN_Ack(gvar);
 	}
 
@@ -1592,7 +1589,9 @@ reset:
 			modexClearRegion(&gvar->video.page[0], gvar->video.page[0].dx, gvar->video.page[0].dy, gvar->video.page[0].sw, gvar->video.page[0].sh, 8);
 		}else
 #endif
+		{
 			clrscr();
+		}
 		sprintf(global_temp_status_text, "block #%04u", q); MMSMPRINTMEMINFO
 //		sprintf(global_temp_status_text, "%Fp", scaninfo[q].scan->useptr); MMSMPRINTMEMINFO
 		sprintf(global_temp_status_text, "start:  %04x", (unsigned)scaninfo[q].scan->start); MMSMPRINTMEMINFO
@@ -1688,9 +1687,11 @@ reset:
 			case sc_Space:
 				oldq = q;
 				restarted = true;
-				modexClearRegion(&gvar->video.page[0], gvar->video.page[0].dx, gvar->video.page[0].dy, gvar->video.page[0].sw, gvar->video.page[0].sh, 8);
+#ifdef __WATCOMC__
+				if(gvar->video.VL_Started) modexClearRegion(&gvar->video.page[0], gvar->video.page[0].dx, gvar->video.page[0].dy, gvar->video.page[0].sw, gvar->video.page[0].sh, 8);
+#endif
 				goto reset;
-			break;
+
 			case sc_Escape:
 				done = true;
 			break;