oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-06 17:41:04 +00:00
Code Wiki Activity

Cleanup ClientLauncher structure (#10160)

Browse source 
Remove duplicated variables and unify the startup data into a new (inherited) struct.
This commit is contained in:
SmallJoker 2020-07-14 19:10:37 +02:00 • committed by GitHub
parent 2bec83eec0
commit 4fa1e03f68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 197 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/client/clientlauncher.h
View file

@ -32,15 +32,15 @@ public:
~ClientLauncher();
bool run(GameParams &game_params, const Settings &cmd_args);
bool run(GameStartData &start_data, const Settings &cmd_args);
protected:
void init_args(GameParams &game_params, const Settings &cmd_args);
private:
void init_args(GameStartData &start_data, const Settings &cmd_args);
bool init_engine();
void init_input();
bool launch_game(std::string &error_message, bool reconnect_requested,
GameParams &game_params, const Settings &cmd_args);
GameStartData &start_data, const Settings &cmd_args);
void main_menu(MainMenuData *menudata);
@ -48,23 +48,8 @@ protected:
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 = "";
InputHandler *input = nullptr;
MyEventReceiver *receiver = nullptr;
gui::IGUISkin *skin = nullptr;
gui::IGUIFont *font = nullptr;
SubgameSpec gamespec;
WorldSpec worldspec;
bool simple_singleplayer_mode = false;
// 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 = "inv£lid";
std::string current_password = "";
std::string current_address = "does-not-exist";
int current_port = 0;
};