Fixed Font character placement.

glPrintf now also activates the string.

src/GLString.cpp

@@ -118,6 +118,10 @@ int GLString::glPrintf(int x, int y, const char *string, ...) {
     if (_num_string > _num_string_max)
         return -2;
 
+    // xythobuz 2014.02.23, Activate, so we don't have to call SetString
+    // directly after glPrintf, with the same text...
+    _string[_num_string].active = true;
+
     // Mongoose 2002.01.01, Assume no longer than 'sz' wide lines
     //   on first try
     _string[_num_string].text = new char[sz];

src/Render.cpp

@@ -259,10 +259,9 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
     mString.Init(5);
 
     // String 0: OpenRaider version in lower right corner
-    mString.Scale(1.00);
+    mString.Scale(0.75f);
     err = mString.glPrintf(mWidth - 15 * strlen(VERSION),
             mHeight-35, "%s", VERSION);
-    mString.SetString(0, "%s", VERSION);
 
     if (err)
     {
@@ -270,9 +269,8 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
     }
 
     // String 1: Used for FPS in game text output
-    mString.Scale(0.75);
+    mString.Scale(0.60f);
     err = mString.glPrintf(8, mHeight - 25, "%s", "                ");
-    mString.SetString(1, "%s", "                ");
 
     if (err)
     {
@@ -280,9 +278,8 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
     }
 
     // String 2: Used for game console
-    mString.Scale(1.0);
+    mString.Scale(0.75f);
     err = mString.glPrintf(8, 25, "%s", console);
-    mString.SetString(2, "%s", console);
 
     if (err)
     {
@@ -290,9 +287,8 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
     }
 
     // String 3: Used for one line map select menu
-    mString.Scale(1.75);
+    mString.Scale(1.25f);
     err = mString.glPrintf(mWidth/2-235, mHeight/2-24, "%s", menu);
-    mString.SetString(3, "%s", menu);
 
     if (err)
     {
@@ -300,9 +296,8 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
     }
 
     // String 4: Used for one line in game text output
-    mString.Scale(1.0);
+    mString.Scale(0.75f);
     err = mString.glPrintf(8, 55, "%s", "                    ");
-    mString.SetString(4, "%s", "                    ");
 
     if (err)
     {

src/Texture.cpp

@@ -320,7 +320,11 @@ gl_font_t *Texture::generateFont(ttf_texture_t *texture)
             h = 0;
         }
 
-        h += -texture->fontHeight/2-(texture->fontDescent + texture->glyphs[i].miny);
+        // After migrating to SDL2_TTF, some characters where rendered slightly
+        // vertically offset. However, dumping the font texture as TGA did not show
+        // this offset. It turns out, this fixes the issue...? O.o --xythobuz
+        // h += -texture->fontHeight/2-(texture->fontDescent + texture->glyphs[i].miny);
+        h -= texture->fontHeight/2 + texture->fontDescent;
 
         /* Make a list for this TTF glyph, one nonuniform Quad per glyph */
         glNewList(font->drawListBase + i, GL_COMPILE);
@@ -405,6 +409,8 @@ ttf_texture_t *Texture::generateFontTexture(const char *filename, int pointSize,
     int renderStyle = TTF_STYLE_NORMAL;
     TTF_SetFontStyle(font, renderStyle);
 
+    TTF_SetFontHinting(font, TTF_HINTING_LIGHT);
+
     /* Allocate a new TTF font texture */
     printf("Creating font texture from '%s'...\n", filename);
     texture = new ttf_texture_t;