diff --git a/data/fonts/AR PL SungtiL GB0.png b/data/fonts/AR PL SungtiL GB0.png new file mode 100644 index 000000000..041dad4cb Binary files /dev/null and b/data/fonts/AR PL SungtiL GB0.png differ diff --git a/data/fonts/LayneHansom.xml b/data/fonts/LayneHansom.xml deleted file mode 100644 index 79d708dc6..000000000 Binary files a/data/fonts/LayneHansom.xml and /dev/null differ diff --git a/data/fonts/StkFont.xml b/data/fonts/StkFont.xml new file mode 100644 index 000000000..e95b8547e Binary files /dev/null and b/data/fonts/StkFont.xml differ diff --git a/data/gui/License.txt b/data/gui/License.txt index de2c89ee1..09691f21a 100644 --- a/data/gui/License.txt +++ b/data/gui/License.txt @@ -11,9 +11,6 @@ Logo and Logo_slim : under CC-BY-SA 3.0+ by 'rastapax' difficulty_*.png icons, released under Creative-Commons BY-SA 3, By Conso (Constantin Pelikan) -Okolaks font by Gluk, released under Open Font License -Layne Hansom font by Scott V. Layne, with modifications by Magne Djupvik. released under Open Font License - title_font, by Marianne Gagnon (Auria), released under CC-BY-SA 3+ screen*.png, by Marianne Gagnon (Auria), including elements from the public domain Tango icon set diff --git a/src/guiengine/CGUIFont.cpp b/src/guiengine/CGUIFont.cpp index 1324dab4e..2c0679d49 100644 --- a/src/guiengine/CGUIFont.cpp +++ b/src/guiengine/CGUIFont.cpp @@ -613,7 +613,11 @@ void ScalableFont::draw(const core::stringw& text, const core::rect& positi // perform lazy loading lazyLoadTexture(texID); texture = SpriteBank->getTexture(texID); - assert(texture != NULL); + if (texture == NULL) + { + std::cerr << "WARNING: character not found in current font\n"; + continue; // no such character + } } driver->draw2DImage(texture, diff --git a/src/guiengine/engine.cpp b/src/guiengine/engine.cpp index a453266cf..24e28b7f3 100644 --- a/src/guiengine/engine.cpp +++ b/src/guiengine/engine.cpp @@ -205,7 +205,7 @@ void init(IrrlichtDevice* device_a, IVideoDriver* driver_a, AbstractStateManager const float title_text_scale = 0.2f + 0.2f*std::max(0, screen_width - 640)/564.0f; //ScalableFont* sfont = new ScalableFont(g_env, (file_manager->getGUIDir() + "/okolaks.xml").c_str()); - ScalableFont* sfont = new ScalableFont(g_env, file_manager->getFontFile("LayneHansom.xml").c_str() ); + ScalableFont* sfont = new ScalableFont(g_env, file_manager->getFontFile("StkFont.xml").c_str() ); sfont->setScale(normal_text_scale); sfont->setKerningHeight(-5); g_font = sfont;