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/main.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/main.cpp')
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 7141bec66..d9fa8faa2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1569,8 +1569,8 @@ ClientLauncher::~ClientLauncher() if (input) delete input; - if (glb_fontengine) - delete glb_fontengine; + if (g_fontengine) + delete g_fontengine; if (device) device->drop(); @@ -1630,8 +1630,8 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args) skin->setColor(gui::EGDC_HIGH_LIGHT, video::SColor(255, 70, 100, 50)); skin->setColor(gui::EGDC_HIGH_LIGHT_TEXT, video::SColor(255, 255, 255, 255)); - glb_fontengine = new FontEngine(g_settings, guienv); - assert(glb_fontengine != NULL); + g_fontengine = new FontEngine(g_settings, guienv); + assert(g_fontengine != NULL); #if (IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR >= 2 // Irrlicht 1.8 input colours |