BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

FontEngine: Don't use file extension to check font file compatibility

Browse Source
This commit is contained in:
kwolekr 2014-12-29 01:46:13 -05:00
parent cc3ab5efa5
commit 9eb492229b
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fontengine.cpp
View File

@ -337,12 +337,6 @@ void FontEngine::initFont(unsigned int basesize, FontMode mode)
std::string font_path = g_settings->get(font_config_prefix + "font_path"); std::string font_path = g_settings->get(font_config_prefix + "font_path");
if (font_path.substr(font_path.length() -4) != ".ttf") {
errorstream << "FontEngine: \"" << font_path
<< "\" doesn't seem to be a ttf File." << std::endl;
return;
}
irr::gui::IGUIFont* font = gui::CGUITTFont::createTTFont(m_env, irr::gui::IGUIFont* font = gui::CGUITTFont::createTTFont(m_env,
font_path.c_str(), size, true, true, font_shadow, font_path.c_str(), size, true, true, font_shadow,
font_shadow_alpha); font_shadow_alpha);
@ -378,7 +372,7 @@ void FontEngine::initSimpleFont(unsigned int basesize, FontMode mode)
return; return;
} }
if ((ending == ".xml") || ( ending == ".png")) { if ((ending == ".xml") || (ending == ".png")) {
basename = font_path.substr(0,font_path.length()-4); basename = font_path.substr(0,font_path.length()-4);
} }