summaryrefslogtreecommitdiff
path: root/src/gui/gui.cpp
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2009-02-11 22:17:47 +0000
committerDavid Athay <ko2fan@gmail.com>2009-02-11 22:17:47 +0000
commit5e01985ee82007307c96f900057679485b977196 (patch)
tree818ee5c5ae3b02708c0fe5d75aad1ef25906e3f4 /src/gui/gui.cpp
parent91111ca5d13072ea3b834e23835df9c077329e39 (diff)
parent7b007058afab8ea920a5d60b31f45958e5622878 (diff)
downloadmana-client-5e01985ee82007307c96f900057679485b977196.tar.gz
mana-client-5e01985ee82007307c96f900057679485b977196.tar.bz2
mana-client-5e01985ee82007307c96f900057679485b977196.tar.xz
mana-client-5e01985ee82007307c96f900057679485b977196.zip
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/gui/gui.cpp')
-rw-r--r--src/gui/gui.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 87304bd1..a7946993 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -110,7 +110,7 @@ Gui::Gui(Graphics *graphics):
std::string path = resman->getPath("fonts/dejavusans.ttf");
try
{
- const int fontSize = config.getValue("fontSize", 11);
+ const int fontSize = (int)config.getValue("fontSize", 11);
mGuiFont = new TrueTypeFont(path, fontSize);
}
catch (gcn::Exception e)
@@ -123,7 +123,7 @@ Gui::Gui(Graphics *graphics):
path = resman->getPath("fonts/dejavusans-bold.ttf");
try
{
- const int fontSize = config.getValue("fontSize", 11);
+ const int fontSize = (int)config.getValue("fontSize", 11);
boldFont = new TrueTypeFont(path, fontSize);
}
catch (gcn::Exception e)