modified: 16.exe

	modified:   fonttes0.exe
	modified:   maptest.exe
	modified:   palettec.exe
	modified:   pcxtest.exe
	modified:   src/fonttes0.c
	modified:   src/lib/modex16.c
	modified:   src/lib/modex16.h
	modified:   test.exe
	modified:   test2.exe

diff --git a/16.exe b/16.exe
index a6418783694ebf30fd456a84201829e2abaa7199..f2cbc3ab2e23aebc034f0002ef5ed1e0e729e1e5 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/fonttes0.exe b/fonttes0.exe
index 40b2c4eb2ca228cd479b2acbdd05e4011b3f1a1f..84c525684fe5bf8b00831e181ecc8a7d753c813b 100644 (file)
Binary files a/fonttes0.exe and b/fonttes0.exe differ

diff --git a/maptest.exe b/maptest.exe
index cb42cfc7c45adc0cbac142f914e9e09a5f88f40e..c8fd20c677d35585439ef1a3d2ea47ce86c63f2d 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index bdbd900d5719098f82fe678b6b79c723a4355ee0..119172a3a3099742b0982d2116eced5288557d01 100644 (file)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 03194e160fa3320394a82b98c4a5cc66c8a9443c..9794ec35e7e74f32d03971eb1b647b2793db9617 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/src/fonttes0.c b/src/fonttes0.c
index 6b0821177d14581ba4e1ca52ba793fa2e828bdb3..4a775a3ad92b53bf5a1a4a75e56de5a4949cc3ce 100644 (file)
--- a/src/fonttes0.c
+++ b/src/fonttes0.c
@@ -169,6 +169,7 @@ void main(int argc, char near *argv[])
                        //printf("l[i]=%d       ", l[i]);
                        //printf("j=%d  ", j);
                        //printf("%02x\n", l[i] & j);
+                               //modexPutPixel(xp, i, l[i] & j ? 15:0);
                                modexClearRegion(&page, xp, i, 4, 4, l[i] & j ? 15:0);
 //while(!getch());
                        xp++;

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 1534ed560faaa8d727f5c71985b01d8a10ec3f0c..98fbb628174f4250e56aa4379aaf9d175aa5f82d 100644 (file)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -941,38 +941,42 @@ no... wait.... no wwww
                printf("chkcolor end~\n");
                free(pal);
 }
-/*
-; on entry X,Y = location and C = color (0-15)
-putpixel   proc near uses ax bx cx dx
-
-; byte offset = Y * (horz_res / 8) + int(X / 8)
-
-           mov  ax,Y                    ; calculate offset
-           mov  dx,80                   ;
-           mul  dx                      ; ax = y * 80
-           mov  bx,X                    ;
-           mov  cl,bl                   ; save low byte for below
-           shr  bx,03                   ; div by 8
-           add  bx,ax                   ; bx = offset this group of 8 pixels
-
-           mov  dx,03CEh                ; set to video hardware controller
-
-           and  cl,07h                  ; Compute bit mask from X-coordinates
-           xor  cl,07h                  ;  and put in ah
-           mov  ah,01h                  ;
-           shl  ah,cl                   ;
-           mov  al,08h                  ; bit mask register
-           out  dx,ax                   ;
 
-           mov  ax,0205h                ; read mode 0, write mode 2
-           out  dx,ax                   ;
+void modexPutPixel(word x, word y, byte Color)
+{
+// on entry X,Y = location and C = color (0-15)
+//putpixel   proc near uses ax bx cx dx
+// byte offset = Y * (horz_res / 8) + int(X / 8)
 
-           mov  al,es:[bx]              ; load to latch register
-           mov  al,Color
-           mov  es:[bx],al              ; write to register
+// byte offset = Y * (horz_res / 8) + int(X / 8)
 
-           ret
-putpixel   endp*/
+       __asm
+       {
+               mov  ax,y                    // calculate offset
+               mov  dx,80
+               mul  dx                      // ax = y * 80
+               mov  bx,x
+               mov  cl,bl                   // save low byte for below
+               //shr  bx,03
+               add  bx,ax                   // bx = offset this group of 8 pixels
+
+               mov  dx,GC_INDEX                // set to video hardware controller
+
+               and  cl,07h                  // Compute bit mask from X-coordinates
+               xor  cl,07h                  //  and put in ah
+               mov  ah,01h
+               shl  ah,cl
+               mov  al,08h                  // bit mask register
+               out  dx,ax
+
+               mov  ax,0205h                // read mode 0, write mode 2
+               out  dx,ax
+
+               mov  al,es:[bx]              // load to latch register
+               mov  al,Color
+               mov  es:[bx],al              // write to register
+       }
+}
 
 void bputs(/*bmp_t *bmp, */unsigned x, unsigned y, const char *s)\r
 {\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index f21611746d38cc1ea14d0610a3cc56147e55a2ab..66330fe166c1c9683a3238ef7b973a191be3a917 100644 (file)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -92,6 +92,7 @@ void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset);
 void modexPalUpdate1(byte *p);
 void modexPalUpdate0(byte *p);
 void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
+void modexPutPixel(word x, word y, byte Color);
 void bputs(/*bmp_t *bmp, */unsigned x, unsigned y, const char *s);
 void modexWaitBorder();
 

diff --git a/test.exe b/test.exe
index a6e4adf59f76db07f44164782ed259dc921e74d2..965a131a41ba722d6bf0802bfcc7b3f224f7b7be 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index c940126140fe8205a3774ed4b6355616c6d70eb0..6f009cc24933067fc4bfb4543ec883eb0deaf1e4 100644 (file)
Binary files a/test2.exe and b/test2.exe differ