diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-16 11:25:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-16 11:25:52 +0200 |
commit | 76be103a91d6987527af19e87d93007be8ba8a67 (patch) | |
tree | c83c21e7c0adc37251f77788023eb3c242a751ca /src/guiEngine.h | |
parent | 49d6e5f4ab79078d1608c22a9cce286b3cf86eb9 (diff) | |
download | hax-minetest-server-76be103a91d6987527af19e87d93007be8ba8a67.tar.gz hax-minetest-server-76be103a91d6987527af19e87d93007be8ba8a67.zip |
C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) (#5984)
* C++11 patchset 9: move hardcoded init parameters to class definitions
C++11 introduced the possibility to define the default values directly in class definitions, do it on current code
Also remove some unused attributes
* CollisionInfo::bouncy
* collisionMoveResult::collides_xy
* collisionMoveResult::standing_on_unloaded
* Clouds::speed
* More constructor cleanups + some variables removal
* remove only write guiFormSpecMenu::m_old_tooltip
* move header included inside defintions in genericobject.h
* remove some unused since years exception classes
* remove unused & empty debug_stacks_init
* remove unused & empty content_nodemeta_serialize_legacy
* remove forgotten useless bool (bouncy) in collision.cpp code
Diffstat (limited to 'src/guiEngine.h')
-rw-r--r-- | src/guiEngine.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/guiEngine.h b/src/guiEngine.h index e7e5ca05d..e6cea6b4f 100644 --- a/src/guiEngine.h +++ b/src/guiEngine.h @@ -203,28 +203,28 @@ private: /** pointer to data beeing transfered back to main game handling */ MainMenuData* m_data; /** pointer to texture source */ - ISimpleTextureSource* m_texture_source; + ISimpleTextureSource *m_texture_source = nullptr; /** pointer to soundmanager*/ - ISoundManager* m_sound_manager; + ISoundManager *m_sound_manager = nullptr; /** representation of form source to be used in mainmenu formspec */ - FormspecFormSource* m_formspecgui; + FormspecFormSource *m_formspecgui = nullptr; /** formspec input receiver */ - TextDestGuiEngine* m_buttonhandler; + TextDestGuiEngine *m_buttonhandler = nullptr; /** the formspec menu */ - GUIFormSpecMenu* m_menu; + GUIFormSpecMenu *m_menu = nullptr; /** reference to kill variable managed by SIGINT handler */ bool& m_kill; /** variable used to abort menu and return back to main game handling */ - bool m_startgame; + bool m_startgame = false; /** scripting interface */ - MainMenuScripting* m_script; + MainMenuScripting *m_script = nullptr; /** script basefolder */ - std::string m_scriptdir; + std::string m_scriptdir = ""; /** * draw background layer @@ -272,7 +272,7 @@ private: void setTopleftText(const std::string &text); /** pointer to gui element shown at topleft corner */ - irr::gui::IGUIStaticText* m_irr_toplefttext; + irr::gui::IGUIStaticText *m_irr_toplefttext = nullptr; /** and text that is in it */ EnrichedString m_toplefttext; @@ -296,7 +296,7 @@ private: }; /** is drawing of clouds enabled atm */ - bool m_clouds_enabled; + bool m_clouds_enabled = true; /** data used to draw clouds */ clouddata m_cloud; @@ -308,6 +308,4 @@ private: }; - - #endif /* GUI_ENGINE_H_ */ |