diff options
| author | Weblate <42@minetest.ru> | 2013-02-28 18:03:28 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-02-28 18:03:28 +0100 |
| commit | 22e186b4aa88b585e71500c4e9a03bf69b0b6191 (patch) | |
| tree | 14c5b7a73cf144ba7cf3066caac088a200f81a72 /src/guiChatConsole.cpp | |
| parent | 372acf7b8eca0614a4a0da93cfbaccbcd459b36b (diff) | |
| parent | d31f07bd4b83f858cce589faac56922e12ba670f (diff) | |
| download | minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.tar.gz minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.tar.bz2 minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/guiChatConsole.cpp')
| -rw-r--r-- | src/guiChatConsole.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp index 0101b99bb..f522af01f 100644 --- a/src/guiChatConsole.cpp +++ b/src/guiChatConsole.cpp @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com> +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -32,6 +32,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "gettext.h" +#if USE_FREETYPE +#include "xCGUITTFont.h" +#endif + inline u32 clamp_u8(s32 value) { return (u32) MYMIN(MYMAX(value, 0), 255); @@ -90,8 +94,14 @@ GUIChatConsole::GUIChatConsole( // load the font // FIXME should a custom texture_path be searched too? + #if USE_FREETYPE + std::string font_name = g_settings->get("mono_font_path"); + u16 font_size = g_settings->getU16("mono_font_size"); + m_font = gui::CGUITTFont::createTTFont(env, font_name.c_str(), font_size); + #else std::string font_name = "fontdejavusansmono.png"; m_font = env->getFont(getTexturePath(font_name).c_str()); + #endif if (m_font == NULL) { dstream << "Unable to load font: " << font_name << std::endl; |