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 7c6d3b2abeb050a9ada4c18194cdfe5fcdbf0937..81a9f2fe7b4fa3f0d166a02a437760e84d8b08e3 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 29eff251352e5daf2e2f2b84f2573189e137c831..918cc8d3b54916e65db9018047299ce64051b34e 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fmemtest.exe b/fmemtest.exe
index 4df97337e480d185d293fe5a3ebd031b86c0dc0e..624bc60e3c0778ebfc955ae0e52d32f11e85b1b7 100644 (file)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index 9e1cf4c849bf50f7009342de4618bbfe74234d44..f7d95dc9fb6b0fe278a4161ea04d70410250ab10 100644 (file)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttes0.exe b/fonttes0.exe
index ba35e19f9a930c21f4edd4eb1474ed199afed13e..1bbefdd92848137150c71d7ebb115f67bfac21a1 100644 (file)
Binary files a/fonttes0.exe and b/fonttes0.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 723156c1233ad2c81b5ac288a829f3b47c5a9a7e..be48aee686d85a3d55fe4b4d8a7b972b5cbe9098 100644 (file)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index f83dba5fd0ed90f1a3cbc3ea0af941136da0d141..d13563f3e3bf9aa2df5bc2f94c5dacf5d917d014 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/makefile b/makefile
index 03b0183b7f9cef31d6fb159f39a7abffe59d06ee..97679804295e489ad9121093c259e6b8dca04248 100644 (file)
--- 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 5653055346a2de29ac5f7d9bd88633fffa2211dc..40a835bd9c3e68a95a3f0ac8a7b847bdca171795 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/miditest.exe b/miditest.exe
index 4705605374cefef33945220a48703244836ac3ab..06dc46fb27b2433e8d2ee6fc7afa4d21c1aea1dc 100644 (file)
Binary files a/miditest.exe and b/miditest.exe differ

diff --git a/palettec.exe b/palettec.exe
index 119186852495951e291fcc1407b07db724b7a3e2..857bf7bd7924194edc2abf1e6db3a936c008b52b 100644 (file)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 5200e0d6f1e0c1eadbf3aba55b6ebbfe20c1fad5..ba936221540a05ba5aeac9087f42348d1e8ccca3 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/sountest.exe b/sountest.exe
index 55721859d4b4494e33ca26a4feb9a5cad1e47546..10eefab6aa47af06c9b09462ad163a2dddbb5110 100644 (file)
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 524d7ae53892768a0012249766823faea0c689c2..070db38d99050be8d98f2f9892f96704dec9b582 100644 (file)
--- 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 10c5e9c8a1ea165958f1926037e29383089ad935..986cbc556b5e29154bec405cbc7655d9785d62f6 100644 (file)
--- 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);
 }\r
 \r
 void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str)\r

diff --git a/test.exe b/test.exe
index ff36674ac599ee67aa3b3e06d8b056a823d8c2fd..53e0934abd6f2412bcf22ad75fd191114ebde1b3 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 49f7b7e46d052e76d3449ae0830871c0b9734f0a..cb95942c432c555060287f6de6d7274941c39133 100644 (file)
Binary files a/test2.exe and b/test2.exe differ

diff --git a/testemm.exe b/testemm.exe
index b28754b87aa2aadf76af73c9cad5aeb090c08982..55c56d3100337416d7146cefef8012a28fc3004c 100644 (file)
Binary files a/testemm.exe and b/testemm.exe differ

diff --git a/testemm0.exe b/testemm0.exe
index 692e59b7fcbc540124e2912859e55a6cf539c7b4..cb076ad282a6c26c79f59dd113539161dedea987 100644 (file)
Binary files a/testemm0.exe and b/testemm0.exe differ

diff --git a/tsthimem.exe b/tsthimem.exe
index 14bb705265e3e3a5d4105875e1424194e1d8e6fc..72f3e0bfa28f591434960813991e3877ce71d297 100644 (file)
Binary files a/tsthimem.exe and b/tsthimem.exe differ