summaryrefslogtreecommitdiff
path: root/src/client/clientlauncher.h
diff options
context:
space:
mode:
authorVincent Glize <vincentglize@hotmail.fr>2017-06-21 08:04:45 +0200
committerLoïc Blot <nerzhul@users.noreply.github.com>2017-06-21 08:04:45 +0200
commitaf3badf7a9307acd4993764cd805718849e4f942 (patch)
tree0e096b45eebc2e20ae8a5be3faaedc9234217934 /src/client/clientlauncher.h
parent76074ad81abe68aa2b7af4d072b659f60f1af38c (diff)
downloadminetest-af3badf7a9307acd4993764cd805718849e4f942.tar.gz
minetest-af3badf7a9307acd4993764cd805718849e4f942.tar.bz2
minetest-af3badf7a9307acd4993764cd805718849e4f942.zip
C++11 cleanup on constructors dir client (#6012)
* C++11 cleanup on constructors dir client
Diffstat (limited to 'src/client/clientlauncher.h')
-rw-r--r--src/client/clientlauncher.h54
1 files changed, 18 insertions, 36 deletions
diff --git a/src/client/clientlauncher.h b/src/client/clientlauncher.h
index 4ff77bc03..9e0560b14 100644
--- a/src/client/clientlauncher.h
+++ b/src/client/clientlauncher.h
@@ -28,25 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class ClientLauncher
{
public:
- ClientLauncher() :
- list_video_modes(false),
- skip_main_menu(false),
- use_freetype(false),
- random_input(false),
- address(""),
- playername(""),
- password(""),
- device(NULL),
- input(NULL),
- receiver(NULL),
- skin(NULL),
- font(NULL),
- simple_singleplayer_mode(false),
- current_playername("inv£lid"),
- current_password(""),
- current_address("does-not-exist"),
- current_port(0)
- {}
+ ClientLauncher() {}
~ClientLauncher();
@@ -66,29 +48,29 @@ protected:
void speed_tests();
bool print_video_modes();
- bool list_video_modes;
- bool skip_main_menu;
- bool use_freetype;
- bool random_input;
- std::string address;
- std::string playername;
- std::string password;
- IrrlichtDevice *device;
- InputHandler *input;
- MyEventReceiver *receiver;
- gui::IGUISkin *skin;
- gui::IGUIFont *font;
- scene::ISceneManager *smgr;
+ bool list_video_modes = false;
+ bool skip_main_menu = false;
+ bool use_freetype = false;
+ bool random_input = false;
+ std::string address = "";
+ std::string playername = "";
+ std::string password = "";
+ IrrlichtDevice *device = nullptr;
+ InputHandler *input = nullptr;
+ MyEventReceiver *receiver = nullptr;
+ gui::IGUISkin *skin = nullptr;
+ gui::IGUIFont *font = nullptr;
+ scene::ISceneManager *smgr = nullptr;
SubgameSpec gamespec;
WorldSpec worldspec;
bool simple_singleplayer_mode;
// These are set up based on the menu and other things
// TODO: Are these required since there's already playername, password, etc
- std::string current_playername;
- std::string current_password;
- std::string current_address;
- int current_port;
+ std::string current_playername = "inv£lid";
+ std::string current_password = "";
+ std::string current_address = "does-not-exist";
+ int current_port = 0;
};
#endif