From: sparky4 <sparky4@cock.li>
Date: Sat, 19 Aug 2017 00:05:06 +0000 (-0500)
Subject: i do not know 100% wat i have done but i plan on getting the borland c stuff and... 
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=63296db7e0f6bc7b83bd1e28373f9631beb11ec5;p=16.git

i do not know 100% wat i have done but i plan on getting the borland c stuff and IMFPLAY to work againh
---

diff --git a/bcexmm.dsk b/bcexmm.dsk
index 0ef010ca..4848bb94 100755
Binary files a/bcexmm.dsk and b/bcexmm.dsk differ
diff --git a/bcexmm.exe b/bcexmm.exe
new file mode 100755
index 00000000..c103df59
Binary files /dev/null and b/bcexmm.exe differ
diff --git a/bcexmm.prj b/bcexmm.prj
index e3ecc2f2..13dcb52b 100755
Binary files a/bcexmm.prj and b/bcexmm.prj differ
diff --git a/src/exmmtest.c b/src/exmmtest.c
index 276c1721..83aa4e2b 100755
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -52,11 +52,12 @@ void	TL_VidInit(global_game_variables_t *gvar)
 	gvar->video.old_mode = 3;
 }
 
+void VL_print(const byte *str, nibble pagenum, global_game_variables_t *gvar){ printf("%s\n", str); }
+
 #ifdef __WATCOMC__
 void VL_ShowPage(page_t *page, boolean vsync, boolean sr){}
 void modexClearRegion(page_t *page, int x, int y, int w, int h, byte color){}
 void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word color, word bgcolor, boolean vidsw, const byte *str){ printf("%s\n", str); }
-void VL_print(const byte *str, nibble pagenum, global_game_variables_t *gvar){ printf("%s\n", str); }
 void modexpdump(nibble pagenum, global_game_variables_t *gvar){}
 #endif
 #endif
diff --git a/src/imfplay.c b/src/imfplay.c
index 697b6d36..1895d77d 100755
--- a/src/imfplay.c
+++ b/src/imfplay.c
@@ -19,7 +19,7 @@
 #include "src/lib/16_mm.h"
 #include "src/lib/16_hc.h"
 #include "src/lib/16_dbg.h"
-#include "src/lib/16_sd.h"
+//#include "src/lib/16_sd.h"
 
 // #include <stdio.h>
 // #include <conio.h> /* this is where Open Watcom hides the outp() etc. functions */
diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index c207e024..90dcdae0 100755
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -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__
+//#ifdef __WATCOMC__
 //#define MMSMPANVID
 #define MMSMSCANINFO
-#endif
+//#endif
 
 /*
 =====================
@@ -1361,7 +1360,7 @@ 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 +1385,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 +1500,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 +1688,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;
diff --git a/src/lib/16_vl_1.c b/src/lib/16_vl_1.c
index b5c826da..a6cc8e26 100755
--- a/src/lib/16_vl_1.c
+++ b/src/lib/16_vl_1.c
@@ -26,8 +26,8 @@
 #include "src/lib/16_vl.h"
 
 static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */
-#define VGASTRIDEVARIABLE	vga_state.vga_stride
-//#define VGASTRIDEVARIABLE	gvar->video.page[0].stridew
+//#define VGASTRIDEVARIABLE	vga_state.vga_stride
+#define VGASTRIDEVARIABLE	gvar->video.page[0].stridew
 
 //===========================================================================