From: sparky4 <sparky4@cock.li>
Date: Mon, 20 Jul 2015 13:26:21 +0000 (-0500)
Subject: wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=a36921f9d31cc4a8e6a8041d5b9968b2cf4bb860;p=16.git

wwww

	modified:   16.exe
	modified:   DEBUG.TXT
	modified:   MMDUMP.TXT
	modified:   exmmtest.exe
	modified:   fmemtest.exe
	modified:   fontgfx.exe
	modified:   fonttes0.exe
	modified:   fonttest.exe
	modified:   maptest.exe
	modified:   palettec.exe
	modified:   pcxtest.exe
	modified:   sountest.exe
	modified:   src/lib/16_mm.c
	modified:   src/lib/modex16.c
	modified:   test.exe
	modified:   test2.exe
---

diff --git a/16.exe b/16.exe
index 61bca271..d6f4bcd6 100644
Binary files a/16.exe and b/16.exe differ
diff --git a/DEBUG.TXT b/DEBUG.TXT
index 129128d9..5b27bf00 100644
--- a/DEBUG.TXT
+++ b/DEBUG.TXT
@@ -1,6 +1,6 @@
-Seg:0	Size:176768	Owner:0x2f84
-Seg:2b28	Size:4096	Owner:0xfb22
-Seg:2c28	Size:31344	Owner:0x1c58
-Seg:3957	Size:990512	Owner:0xe686
-Seg:3939	Size:683120	Owner:0xc00b
-Seg:e000	Size:131056	Owner:0x168b
+Seg:0	Size:175904	Owner:0x8370
+Seg:2af2	Size:4096	Owner:0xfb20
+Seg:2bf2	Size:31344	Owner:0x1c58
+Seg:3901	Size:544	Owner:0xe90
+Seg:4752	Size:625376	Owner:0xf476
+Seg:e000	Size:131056	Owner:0x76ff
diff --git a/MMDUMP.TXT b/MMDUMP.TXT
index 43a7689d..1db9e6b0 100644
Binary files a/MMDUMP.TXT and b/MMDUMP.TXT differ
diff --git a/exmmtest.exe b/exmmtest.exe
index cba1ed30..c1eda1a8 100644
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fmemtest.exe b/fmemtest.exe
index 624bc60e..f74dc944 100644
Binary files a/fmemtest.exe and b/fmemtest.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index 681c22ca..01ff581c 100644
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/fonttes0.exe b/fonttes0.exe
index 5a33e5cd..aab4b03e 100644
Binary files a/fonttes0.exe and b/fonttes0.exe differ
diff --git a/fonttest.exe b/fonttest.exe
index be48aee6..2cc9c1d7 100644
Binary files a/fonttest.exe and b/fonttest.exe differ
diff --git a/maptest.exe b/maptest.exe
index b8321131..6f4abf7b 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/palettec.exe b/palettec.exe
index 79e0aac3..d45227a9 100644
Binary files a/palettec.exe and b/palettec.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index ef69a8ff..5e012a41 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/sountest.exe b/sountest.exe
index 10eefab6..ee68b76b 100644
Binary files a/sountest.exe and b/sountest.exe differ
diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index dd754efd..812a8071 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1111,14 +1111,14 @@ CA_OpenDebug ();
 			return;
 		}
 		end = scan->start+scan->length-1;
-				modexhlin(page, scan->start, (unsigned)end, chy, color);
+				//modexhlin(page, scan->start, (unsigned)end, chy, color);
 //++++		VW_Hlin(scan->start,(unsigned)end,0,color);
 
 //++++		VW_Plot(scan->start,0,15);
 				modexClearRegion(page, scan->start, chy, 4, 4, 15);
 		if(scan->next->start > end+1)
 //++++			VW_Hlin(end+1,scan->next->start,0,0);	// black = free
-					modexhlin(page, end+1,scan->next->start, chy, 9);
+					//modexhlin(page, end+1,scan->next->start, chy, 9);
 
 //****#if 0
 printf("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");	//bug!
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 986cbc55..1e086ea7 100644
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -975,9 +975,13 @@ byte modexgetPixel(page_t *page, int x, int y)
 void modexhlin(page_t *page, word xl, word xh, word y, word color)
 {
 	word x;
+	word yy=0;
 
 	for(x=0;x<xh*4;x+=4)
-	modexClearRegion(page, x+xl, y, 4, 4, color);
+	{
+		if(x+4>=SCREEN_WIDTH-1){ x=0; yy+=4; }
+		modexClearRegion(page, x+xl, y+yy, 4, 4, color);
+	}
 	//modexputPixel(page, x+xl, y, color);
 }
 
diff --git a/test.exe b/test.exe
index 9365ecbd..34c3a633 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index dbaf0808..4703a926 100644
Binary files a/test2.exe and b/test2.exe differ