1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-22 17:18:39 +00:00

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
This commit is contained in:
Loïc Blot 2017-06-17 19:11:28 +02:00 committed by GitHub
parent 76be103a91
commit 8f7785771b
59 changed files with 326 additions and 639 deletions

View file

@ -27,14 +27,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
struct MainMenuDataForScript {
MainMenuDataForScript() :
reconnect_requested(false)
{}
MainMenuDataForScript() {}
// Whether the server has requested a reconnect
bool reconnect_requested;
std::string errormessage;
bool reconnect_requested = false;
std::string errormessage = "";
};
struct MainMenuData {
@ -46,22 +43,16 @@ struct MainMenuData {
std::string name;
std::string password;
// Whether to reconnect
bool do_reconnect;
bool do_reconnect = false;
// Server options
bool enable_public;
int selected_world;
bool simple_singleplayer_mode;
int selected_world = 0;
bool simple_singleplayer_mode = false;
// Data to be passed to the script
MainMenuDataForScript script_data;
MainMenuData():
do_reconnect(false),
enable_public(false),
selected_world(0),
simple_singleplayer_mode(false)
{}
MainMenuData() {}
};
#endif