From: kwolekr <kwolekr@minetest.net>
Date: Mon, 29 Dec 2014 06:46:13 +0000 (-0500)
Subject: FontEngine: Don't use file extension to check font file compatibility
X-Git-Tag: 0.4.12~184
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9eb492229b47aa10388555056e7f4effee841371;p=oweals%2Fminetest.git

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

diff --git a/src/fontengine.cpp b/src/fontengine.cpp
index b9d35ba42..79d53c989 100644
--- a/src/fontengine.cpp
+++ b/src/fontengine.cpp
@@ -337,12 +337,6 @@ void FontEngine::initFont(unsigned int basesize, FontMode mode)
 
 		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,
 				font_path.c_str(), size, true, true, font_shadow,
 				font_shadow_alpha);
@@ -378,7 +372,7 @@ void FontEngine::initSimpleFont(unsigned int basesize, FontMode mode)
 		return;
 	}
 
-	if ((ending == ".xml") || ( ending == ".png")) {
+	if ((ending == ".xml") || (ending == ".png")) {
 		basename = font_path.substr(0,font_path.length()-4);
 	}