summaryrefslogtreecommitdiff
path: root/src/gui/gui.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-11-18 20:09:37 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-11-18 20:13:35 +0100
commit254a24b706ad21444ac822935cbfd62bcc388288 (patch)
tree36c2eb900fec03090f27ccb15830fddc141442cb /src/gui/gui.cpp
parentd87d926d52721f6d8bd766025b8c1944a3366ca9 (diff)
downloadmana-client-254a24b706ad21444ac822935cbfd62bcc388288.tar.gz
mana-client-254a24b706ad21444ac822935cbfd62bcc388288.tar.bz2
mana-client-254a24b706ad21444ac822935cbfd62bcc388288.tar.xz
mana-client-254a24b706ad21444ac822935cbfd62bcc388288.zip
Added the font file to branding.xml
Diffstat (limited to 'src/gui/gui.cpp')
-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 6803be65..930d4939 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -103,14 +103,16 @@ Gui::Gui(Graphics *graphics):
ResourceManager *resman = ResourceManager::getInstance();
// Set global font
- std::string path = resman->getPath("fonts/dejavusans.ttf");
+ std::string path = resman->getPath(
+ branding.getValue("guiFont","fonts/dejavusans.ttf"));
if (!path.empty())
{
mGuiFont = new TrueTypeFont(path.c_str(), 11);
}
// Set speech font
- path = resman->getPath("fonts/dejavusans.ttf");
+ path = resman->getPath(
+ branding.getValue("speechFont","fonts/dejavusans.ttf"));
if (!path.empty())
{
speechFont = new TrueTypeFont(path.c_str(), 11);