From: sparky4 <sparky4@cock.li>
Date: Mon, 15 Jun 2015 01:08:32 +0000 (-0500)
Subject: wwww hmmm trying to remember how to work this tjhing www
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=37a96c09c2adf8f95f76470656101a4a940a521d;p=16.git

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 aa7f662b..1c90823e 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index a5970fd5..56ec4451 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 9667cb30..4551490e 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index b25d8674..876f37ca 100644
--- 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,
 	0x0402, 0x0502, 0x0602, 0x0702,
 	0x0802, 0x0902, 0x0A02, 0x0B02,
 	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)
 
 /*****************************************************************************
 *****************************************************************************/
-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)
 {
 	//int i, skip;
 	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;
 //		while (i--) {
diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index f3064d1b..6a497ae5 100644
--- 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 410e743c..53112b7a 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index 2809a69c..246a3d0a 100644
Binary files a/test2.exe and b/test2.exe differ