X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_mm.c;h=db4ea30132d824f1df54bfa53180d3861e0172f1;hb=69116cfff2e915ad9d2f95268432fe4bd0e007d9;hp=c207e0243ead8c7048dd47a5b6d9479e1b29fd99;hpb=d90a09a8fadcf79f1df0f5ac85986e2896e331d5;p=16.git

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index c207e024..db4ea301 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-2019 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();
@@ -1344,10 +1343,10 @@ void MM_SortMem (global_game_variables_t *gvar)
 extern char global_temp_status_text[512];
 extern char global_temp_status_text2[512];
 #endif
-#ifdef __WATCOMC__
-//#define MMSMPANVID
-#define MMSMSCANINFO
-#endif
+//#ifdef __WATCOMC__
+//++??#define MMSMPANVID
+//++++#define MMSMSCANINFO
+//#endif
 
 /*
 =====================
@@ -1357,11 +1356,10 @@ extern char global_temp_status_text2[512];
 =====================
 */
 
-
 void MM_ShowMemory (global_game_variables_t *gvar)
 {
 	mmblocktype far *scan;
-	unsigned color,temp,x,y		,q,w,width,sw;
+	unsigned color,temp,x,y		,q,w/*,width*/,sw;
 	sdword	end,owner;
 	byte		scratch[160],scratch0[4096],str[16];
 #ifdef MMSMSCANINFO
@@ -1386,7 +1384,8 @@ reset:
 
 	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)
@@ -1500,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);
 	}
 
@@ -1689,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;