summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-04 13:17:38 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-04 22:18:26 +0100
commit5cffb54e48034b0bc7bce2ae9a61ce4a24464e63 (patch)
tree9e436425a3d8a417f0177e47557dcf5edf1cc91f /src
parentad276ae0d4679aee9d7e6082fa602b49c6fd940a (diff)
downloadmana-client-5cffb54e48034b0bc7bce2ae9a61ce4a24464e63.tar.gz
mana-client-5cffb54e48034b0bc7bce2ae9a61ce4a24464e63.tar.bz2
mana-client-5cffb54e48034b0bc7bce2ae9a61ce4a24464e63.tar.xz
mana-client-5cffb54e48034b0bc7bce2ae9a61ce4a24464e63.zip
Fixed installing of dejavusans.ttf font.
(cherry picked from mainline commit 8d1299338e033e1de539dae36856e365855fabc1) Conflicts: src/gui/gui.cpp
Diffstat (limited to 'src')
-rw-r--r--src/gui/gui.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 4052951f..61da1a0c 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -106,9 +106,11 @@ Gui::Gui(Graphics *graphics):
Window::setWindowContainer(guiTop);
setTop(guiTop);
- // Set global font (based on ISO-8859-15)
+ // Set global font
+ ResourceManager *resman = ResourceManager::getInstance();
+ std::string path = resman->getPath("fonts/dejavusans.ttf");
try {
- mGuiFont = new TrueTypeFont("data/fonts/dejavusans.ttf", 11);
+ mGuiFont = new TrueTypeFont(path, 11);
}
catch (gcn::Exception e)
{