Fix "wrapped" font (top two lines of glyph rendered at the bottom)

diff --git a/bogl.h b/bogl.h
index be7a6235109c39b519891cd7669f4557f6ed4d13..9dc98a3565b4c93360b66c2cd902374e3fca8d83 100644 (file)
--- a/bogl.h
+++ b/bogl.h
@@ -9,6 +9,7 @@
 typedef struct bogl_font {
   char *name;     /* Font name. */
   int height;     /* Height in pixels. */
+  int spacing;     /* Vertical spacing in pixels. */
   unsigned long *content;   /* 32-bit right-padded bitmap array. */
   short *offset;      /* 256 offsets into content. */
   unsigned char *width;   /* 256 character widths. */

diff --git a/fonts/helvB18.cc b/fonts/helvB18.cc
index 5da9b7f5cb70b0de232ff7d9c9a80a712631cf79..f9b668442cebaf4cade692d45a69a05e8f2869a5 100644 (file)
Binary files a/fonts/helvB18.cc and b/fonts/helvB18.cc differ

diff --git a/fonts/helvB24.cc b/fonts/helvB24.cc
index 8ed2c3b25df3ee83c4522a16483b36bf3f5c72a3..047b58594fcc3d880ee582ce0febcf54c1d1d2bd 100644 (file)
Binary files a/fonts/helvB24.cc and b/fonts/helvB24.cc differ

diff --git a/surface.cc b/surface.cc
index 6ba701d2149f85eeb9f5e910f0d46370521b7970..3ba19cb382e12934cacf3c4902b427b80a91b0cd 100644 (file)
--- a/surface.cc
+++ b/surface.cc
@@ -387,7 +387,7 @@ int Surface::getCharWidth(char c)
 
 int Surface::getFontHeight()
 {
-  return font->height;
+  return font->spacing;
 }
 
 void Surface::screenShot(char* fileName)

diff --git a/surface.h b/surface.h
index 5eaef7811a53d0722d53288a7b617cb94a7635f3..c44656d0717730ce100ce04f4f2fd8a9a5d17b68 100644 (file)
--- a/surface.h
+++ b/surface.h
@@ -110,6 +110,7 @@ typedef struct {
 typedef struct bogl_font {
   char *name;     /* Font name. */
   int height;     /* Height in pixels. */
+  int spacing;     /* Vertical spacing in pixels. */
   unsigned long *content;   /* 32-bit right-padded bitmap array. */
   short *offset;      /* 256 offsets into content. */
   unsigned char *width;   /* 256 character widths. */