diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-17 19:11:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-17 19:11:28 +0200 |
| commit | 8f7785771b9e02b1a1daf7a252550d78ea93053d (patch) | |
| tree | 7a4e4b524dbc63fed3dac99a3844b634cc621d0d /src/guiFormSpecMenu.cpp | |
| parent | 76be103a91d6987527af19e87d93007be8ba8a67 (diff) | |
| download | minetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.tar.gz minetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.tar.bz2 minetest-8f7785771b9e02b1a1daf7a252550d78ea93053d.zip | |
Cpp11 initializers 2 (#5999)
* C++11 patchset 10: continue cleanup on constructors
* Drop obsolete bool MainMenuData::enable_public (setting is called with cURL in server loop)
* More classes cleanup
* More classes cleanup + change NULL tests to boolean tests
Diffstat (limited to 'src/guiFormSpecMenu.cpp')
| -rw-r--r-- | src/guiFormSpecMenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 85d9ef48a..c6a917d12 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -2004,7 +2004,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize) // Add tooltip { - assert(m_tooltip_element == NULL); + assert(!m_tooltip_element); // Note: parent != this so that the tooltip isn't clipped by the menu rectangle m_tooltip_element = addStaticText(Environment, L"",core::rect<s32>(0,0,110,18)); m_tooltip_element->enableOverrideColor(true); @@ -2157,7 +2157,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize) m_tooltip_element->setOverrideFont(m_font); gui::IGUISkin* skin = Environment->getSkin(); - sanity_check(skin != NULL); + sanity_check(skin); gui::IGUIFont *old_font = skin->getFont(); skin->setFont(m_font); |