diff options
| author | sapier <Sapier at GMX dot net> | 2014-11-28 20:06:34 +0100 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-11-30 18:06:54 +0100 |
| commit | 39162de15a2603f1282241aef412ef1b70162b27 (patch) | |
| tree | ddcd0c42420093eaebdda13ed10101308af345dc /src/guiEngine.cpp | |
| parent | d1d6a97b1cd05ec34358b6519fc232fc158cf521 (diff) | |
| download | minetest-39162de15a2603f1282241aef412ef1b70162b27.tar.gz minetest-39162de15a2603f1282241aef412ef1b70162b27.tar.bz2 minetest-39162de15a2603f1282241aef412ef1b70162b27.zip | |
Make hud use fontengine too
Fix non coding style conforming glb_fontengine to g_fontengine
Fix fonts never been deleted due to grabbed to often
Diffstat (limited to 'src/guiEngine.cpp')
| -rw-r--r-- | src/guiEngine.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index e941003fa..814a7504a 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -174,7 +174,7 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, std::wstring t = narrow_to_wide(std::string("Minetest ") + minetest_version_hash); - core::rect<s32> rect(0, 0, glb_fontengine->getTextWidth(t), glb_fontengine->getTextHeight()); + core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(t), g_fontengine->getTextHeight()); rect += v2s32(4, 0); m_irr_toplefttext = @@ -260,14 +260,14 @@ void GUIEngine::run() cloudInit(); - unsigned int text_height = glb_fontengine->getTextHeight(); + unsigned int text_height = g_fontengine->getTextHeight(); while(m_device->run() && (!m_startgame) && (!m_kill)) { //check if we need to update the "upper left corner"-text - if (text_height != glb_fontengine->getTextHeight()) { + if (text_height != g_fontengine->getTextHeight()) { updateTopLeftTextSize(); - text_height = glb_fontengine->getTextHeight(); + text_height = g_fontengine->getTextHeight(); } driver->beginScene(true, true, video::SColor(255,140,186,250)); @@ -590,7 +590,7 @@ void GUIEngine::updateTopLeftTextSize() { std::wstring text = m_irr_toplefttext->getText(); - core::rect<s32> rect(0, 0, glb_fontengine->getTextWidth(text), glb_fontengine->getTextHeight()); + core::rect<s32> rect(0, 0, g_fontengine->getTextWidth(text), g_fontengine->getTextHeight()); rect += v2s32(4, 0); m_irr_toplefttext->remove(); |