added graphical extention~

	modified:   fonttes0.exe
	modified:   fonttest.exe
	modified:   makefile
	modified:   src/fonttes0.c

diff --git a/fonttes0.exe b/fonttes0.exe
index 893906f6808aac8324b5237004c6dabc031b9ad3..6033b087bcf5176e58179be612be06d7cac6519e 100644 (file)
Binary files a/fonttes0.exe and b/fonttes0.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 12c438dd32a684b637ab5122e7c9cce7f547c6c6..d4805671c77db27c68f3dbdc4480edc90139cf84 100644 (file)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/makefile b/makefile
index cfe7184236f99d1048c0502b646b0fb7d84ea600..20796d085f1779f360a3499edf2a691cb75d3a2f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -110,10 +110,10 @@ fmemtest.$(OBJ): $(SRC)fmemtest.c
        wcl $(FLAGS) -c $(SRC)fmemtest.c
 
 fonttest.$(OBJ): $(SRC)fonttest.c
-       wcl -c $(SRC)fonttest.c
+       wcl $(FLAGS) -c $(SRC)fonttest.c
 
 fonttes0.$(OBJ): $(SRC)fonttes0.c
-        wcl -c $(SRC)fonttes0.c
+        wcl $(FLAGS) -c $(SRC)fonttes0.c
 
 inputest.$(OBJ): $(SRC)inputest.c
        wcl $(FLAGS) -c $(SRC)inputest.c
@@ -149,7 +149,7 @@ wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
        wcl $(FLAGS) -c $(WCPULIB)wcpu.c
 
 16text.$(OBJ): $(SRCLIB)16text.c
-       wcl -c $(SRCLIB)16text.c
+       wcl $(FLAGS) -c $(SRCLIB)16text.c
 
 mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
        wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib

diff --git a/src/fonttes0.c b/src/fonttes0.c
index d45039d084f66e5f66a566dc069e1b9e31e39cd5..5f6da62f0e86a01a7101c59b7315ae7858ab6528 100644 (file)
--- a/src/fonttes0.c
+++ b/src/fonttes0.c
@@ -22,7 +22,8 @@
 #include <stdio.h>\r
 #include <conio.h>\r
 #include "lib/types.h"\r
-#include "lib/16text.h"\r
+#include "lib/16text.h"
+#include "lib/modex16.h"\r
 \r
 void main(int argc, char *argv[])\r
 {\r
@@ -31,7 +32,9 @@ void main(int argc, char *argv[])
        char l[16];\r
     char c;\r
     word s, o, t, w;\r
-    word addr = (word) l;\r
+    word addr = (word) l;
+    byte *pal, *pal2;
+       page_t page;\r
     textInit();\r
 \r
     //print the addresses of the fonts\r
@@ -96,9 +99,28 @@ void main(int argc, char *argv[])
                DEC CX\r
                JNZ L1\r
     }\r
+    /* load our palette */\r
+    modexLoadPalFile("data/default.pal", &pal2);\r
 \r
-    //render the letter in ascii art\r
-    for(i=0; i<w; i++) {\r
+    /* save the palette */\r
+    pal  = modexNewPal();\r
+    modexPalSave(pal);\r
+    modexFadeOff(1, pal);\r
+    modexPalBlack();\r
+\r
+    modexEnter();\r
+    modexPalBlack();\r
+\r
+    /* set up the page, but with 16 pixels on all borders in offscreen mem */\r
+    page=modexDefaultPage();\r
+    page.width += 32;\r
+    page.height += 32;
+       modexShowPage(&page);
+       /* fade in */\r
+       modexFadeOn(1, pal2);
+
+       //render the letter in ascii art\r
+       for(i=0; i<w; i++) {\r
        j=1<<8;\r
        while(j) {\r
            //printf("%c", l[i] & j ? '*':' ');
@@ -108,5 +130,13 @@ void main(int argc, char *argv[])
            j>>=1;\r
        }\r
        printf("\n");\r
-    }\r
+    }
+
+       /* fade back to text mode */\r
+       modexFadeOff(1, pal2);\r
+       modexPalBlack();\r
+       modexLeave();\r
+       modexPalBlack();\r
+       modexFadeOn(1, pal);
+
 }\r