From: sparky4 <sparky4@cock.li>
Date: Sun, 19 Jul 2015 21:51:25 +0000 (-0500)
Subject: hmm ok
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=85f8cfe15ac28a5ef39f8d14d3109d1cdbccf616;p=16.git

hmm ok
	modified:   16.exe
	modified:   exmmtest.exe
	modified:   fmemtest.exe
	modified:   fontgfx.exe
	modified:   fonttes0.exe
	modified:   fonttest.exe
	modified:   inputest.exe
	modified:   makefile
	modified:   maptest.exe
	modified:   miditest.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
	modified:   testemm.exe
	modified:   testemm0.exe
	modified:   tsthimem.exe
---

diff --git a/16.exe b/16.exe
index 7c6d3b2a..81a9f2fe 100644
Binary files a/16.exe and b/16.exe differ
diff --git a/exmmtest.exe b/exmmtest.exe
index 29eff251..918cc8d3 100644
Binary files a/exmmtest.exe and b/exmmtest.exe differ
diff --git a/fmemtest.exe b/fmemtest.exe
index 4df97337..624bc60e 100644
Binary files a/fmemtest.exe and b/fmemtest.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index 9e1cf4c8..f7d95dc9 100644
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/fonttes0.exe b/fonttes0.exe
index ba35e19f..1bbefdd9 100644
Binary files a/fonttes0.exe and b/fonttes0.exe differ
diff --git a/fonttest.exe b/fonttest.exe
index 723156c1..be48aee6 100644
Binary files a/fonttest.exe and b/fonttest.exe differ
diff --git a/inputest.exe b/inputest.exe
index f83dba5f..d13563f3 100644
Binary files a/inputest.exe and b/inputest.exe differ
diff --git a/makefile b/makefile
index 03b0183b..97679804 100644
--- a/makefile
+++ b/makefile
@@ -15,7 +15,7 @@ TARGET_OS = dos
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1# -zm
 CFLAGS=-zk0 -wo -x -mc -zu# -zdp# -zp16 -zq
 OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
-FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS)
+FLAGS=-0 -d1 -lr $(OFLAGS) $(CFLAGS) $(DFLAGS) #-d2
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
diff --git a/maptest.exe b/maptest.exe
index 56530553..40a835bd 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/miditest.exe b/miditest.exe
index 47056053..06dc46fb 100644
Binary files a/miditest.exe and b/miditest.exe differ
diff --git a/palettec.exe b/palettec.exe
index 11918685..857bf7bd 100644
Binary files a/palettec.exe and b/palettec.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index 5200e0d6..ba936221 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/sountest.exe b/sountest.exe
index 55721859..10eefab6 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 524d7ae5..070db38d 100644
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1104,7 +1104,7 @@ CA_OpenDebug ();
 		if(scan->start<=end)
 		{
 			//printf(");
-			write (debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n"));
+			write(debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n"));
 			//modexprint(&page, chx, chy, 1, 0, 24, "\nMM_ShowMemory: Memory block order currupted!\n");
 			return;
 		}
@@ -1115,10 +1115,11 @@ CA_OpenDebug ();
 //void VW_Hlin(unsigned xl, unsigned xh, unsigned y, unsigned color);
 
 //++++		VW_Plot(scan->start,0,15);
-				modexputPixel(page, scan->start, chy, 15);
+				//modexputPixel(page, scan->start, chy, 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, color);
+					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 10c5e9c8..986cbc55 100644
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -976,8 +976,9 @@ void modexhlin(page_t *page, word xl, word xh, word y, word color)
 {
 	word x;
 
-	for(x=0;x<xh;x++)
-	modexputPixel(page, x+xl, y, color);
+	for(x=0;x<xh*4;x+=4)
+	modexClearRegion(page, x+xl, y, 4, 4, color);
+	//modexputPixel(page, x+xl, y, color);
 }
 
 void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)
diff --git a/test.exe b/test.exe
index ff36674a..53e0934a 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index 49f7b7e4..cb95942c 100644
Binary files a/test2.exe and b/test2.exe differ
diff --git a/testemm.exe b/testemm.exe
index b28754b8..55c56d31 100644
Binary files a/testemm.exe and b/testemm.exe differ
diff --git a/testemm0.exe b/testemm0.exe
index 692e59b7..cb076ad2 100644
Binary files a/testemm0.exe and b/testemm0.exe differ
diff --git a/tsthimem.exe b/tsthimem.exe
index 14bb7052..72f3e0bf 100644
Binary files a/tsthimem.exe and b/tsthimem.exe differ