better font

diff --git a/GNUmakefile b/GNUmakefile
index d2dbc8b..d0eec53 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -54,5 +54,5 @@ cleandep:
 tools/csprite/csprite:
        $(MAKE) -C tools/csprite
 
 tools/csprite/csprite:
        $(MAKE) -C tools/csprite
 

-font.asm: data/font.png tools/csprite/csprite
-       tools/csprite/csprite -n cs_font -s 16x16 -r 288x32+32+17 -conv565 -nasm $< >$@
+font.asm: data/legible.fnt tools/csprite/csprite
+       tools/csprite/csprite -n cs_font -s 8x16 -conv565 -nasm $< >$@

diff --git a/src/demo.c b/src/demo.c
index fee1e7a..e2b8155 100644 (file)
--- a/src/demo.c
+++ b/src/demo.c
@@ -169,10 +169,10 @@ void cs_puts(void *fb, int x, int y, const char *str)
        while(*str) {
                int c = *str++;
 
        while(*str) {
                int c = *str++;
 

-               if(isalpha(c)) {
-                       cs_font(fb, x, y, toupper(c) - 'A');
+               if(c > ' ' && c < 128) {
+                       cs_font(fb, x, y, c - ' ');

                }
                }

-               x += 14;
+               x += 9;

        }
 }
 
        }
 }