From bd28cda98c51df0ef09ebaa638db43788e1855c5 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 6 Jan 2009 22:56:43 +0100
Subject: Fixed the true type font to render unicode now

---
 src/gui/gui.cpp          | 14 +++++---------
 src/gui/truetypefont.cpp |  4 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 7cf1881c..6a399548 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -22,7 +22,6 @@
 #include <guichan/exception.hpp>
 #include <guichan/image.hpp>
 #include <guichan/imagefont.hpp>
-#include <SDL/SDL_ttf.h>
 
 #include "focushandler.h"
 #include "gui.h"
@@ -45,7 +44,7 @@
 // Guichan stuff
 Gui *gui;
 Viewport *viewport;                    /**< Viewport on the map. */
-SDLInput *guiInput;                    /**< GUI input. */
+SDLInput *guiInput;
 
 // Fonts used in showing hits
 gcn::Font *hitRedFont;
@@ -110,20 +109,17 @@ Gui::Gui(Graphics *graphics):
     Window::setWindowContainer(guiTop);
     setTop(guiTop);
 
+    ResourceManager *resman = ResourceManager::getInstance();
+
     // Set global font
+    std::string path = resman->getPath("fonts/dejavusans.ttf");
     try {
-        mGuiFont = new TrueTypeFont("/usr/local/share/aethyra/data/fonts/dejavusans.ttf", 10);
+        mGuiFont = new TrueTypeFont(path, 11);
     }
     catch (gcn::Exception e)
     {
-        try {
-            mGuiFont = new TrueTypeFont("data/fonts/dejavusans.ttf", 10);
-        }
-        catch (gcn::Exception e)
-        {
         logger->error(std::string("Unable to load dejavusans.ttf: ")
             + e.getMessage());
-        }
     }
 
     // Set speech font
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index f81ea9c2..7f9abd3a 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -58,7 +58,7 @@ class TextChunk
             sdlCol.r = color.r;
             sdlCol.g = color.g;
 
-            SDL_Surface *surface = TTF_RenderText_Blended(
+            SDL_Surface *surface = TTF_RenderUTF8_Blended(
                     font, text.c_str(), sdlCol);
 
             if (!surface)
@@ -170,7 +170,7 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics,
 int TrueTypeFont::getWidth(const std::string& text) const
 {
     int w, h;
-    TTF_SizeText(mFont, text.c_str(), &w, &h);
+    TTF_SizeUTF8(mFont, text.c_str(), &w, &h);
     return w;
 }
 
-- 
cgit v1.2.3-70-g09d2