wwww hmmm trying to remember how to work this tjhing www

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

diff --git a/maptest.exe b/maptest.exe
index aa7f662bbba95d63727abb36c84bb15240dc24e9..1c90823ea085c686a94e52ed8d6d91ea41b29ce7 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index a5970fd519f5f91303c92976137c3f953673cb38..56ec4451bd3cf213d573e7165964e80d6bdc37d2 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 9667cb30dd0eed08ea956579aa50921ec6366d34..4551490e71f730734aace7550f1deb1fd72e1289 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index b25d86741c6c54110680a7c418d85650c526bef9..876f37cab8855e4acc82793b4aec9d4cb4313a3b 100644 (file)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -8,12 +8,12 @@
 
 
 byte far* VGA=(byte far*) 0xA0000000;  /* this points to video memory. */
-word text_mask[16] = {
+/*word text_mask[16] = {
        0x0002, 0x0102, 0x0202, 0x0302,\r
        0x0402, 0x0502, 0x0602, 0x0702,\r
        0x0802, 0x0902, 0x0A02, 0x0B02,\r
        0x0C02, 0x0D02, 0x0E02, 0x0F02
-};
+};*/
 
 static void fadePalette(sbyte fade, sbyte start, word iter, byte *palette);
 static byte tmppal[PAL_SIZE];
@@ -917,7 +917,7 @@ byte far *bios_8x8_font(void)
 
 /*****************************************************************************\r
 *****************************************************************************/\r
-void bputs(page_t *pee, int x, int y, const char *s)\r
+void bputs(page_t *pee, int x, int y, const byte far *s)\r
 {
        //int i, skip;\r
        byte far *font;
@@ -932,7 +932,7 @@ void bputs(page_t *pee, int x, int y, const char *s)
                //src.raster = font + 8 * (*s);
                //BLOODY!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!111111111111!!!11!!11!111!11!!1111!!111!11!!1!!!11!11!!1!!111!11!!
 //             (*(bmp->data)) = (*(font + 8 * (*s)));
-               font_pntr = (*(font + 8 * (*s)));
+               font_pntr = font + 8 * (*s);
 //             font_pntr = font + (c << 3);
 //             i=8;\r
 //             while (i--) {\r

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index f3064d1b182bac0673d331cc3b677433e618f406..6a497ae50f6d527c3f011befc3af19e47c1f9724 100644 (file)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -70,11 +70,11 @@ void modexPalUpdate0(byte *p);
 void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
 void modexWaitBorder();
 byte far *bios_8x8_font(void);
-void bputs(page_t *pee, int x, int y, const char *s);
+void bputs(page_t *pee, int x, int y, const byte far *s);
 
 /* -======================= Constants & Vars ==========================- */
 extern byte far*  VGA;  /* The VGA Memory */
-extern word text_mask[16];
+//extern word text_mask[16];
 #define SCREEN_SEG             0xa000
 #define VIDEO_INT              0x10
 #define SET_MODE               0x00

diff --git a/test.exe b/test.exe
index 410e743c4854484005eaf50cd0b6a78c6d6fc7ef..53112b7a07a1a218d7222448897fb321101330a7 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 2809a69cc5f1b302431ede4b5fba05131ec28d39..246a3d0a84bbacf012ce3e0c02c2672eadc29b1b 100644 (file)
Binary files a/test2.exe and b/test2.exe differ