BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Allow starting local server using --go again (#10229)

Browse Source
This commit is contained in:
SmallJoker
2020-07-29 23:20:01 +02:00
committed by GitHub
parent 470f328216
commit e5725dfb8e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/clientlauncher.cpp
View File

@ -327,13 +327,13 @@ void ClientLauncher::init_args(GameStartData &start_data, const Settings &cmd_ar
// Join a remote server // Join a remote server
start_data.address = cmd_args.get("address"); start_data.address = cmd_args.get("address");
start_data.world_path.clear(); start_data.world_path.clear();
start_data.name = g_settings->get("name");
} }
if (!start_data.world_path.empty()) { if (!start_data.world_path.empty()) {
// Start a singleplayer instance // Start a singleplayer instance
start_data.address = ""; start_data.address = "";
} }
start_data.name = g_settings->get("name");
if (cmd_args.exists("name")) if (cmd_args.exists("name"))
start_data.name = cmd_args.get("name"); start_data.name = cmd_args.get("name");
@ -419,7 +419,6 @@ bool ClientLauncher::launch_game(std::string &error_message,
/* Show the GUI menu /* Show the GUI menu
*/ */
std::string server_name, server_description; std::string server_name, server_description;
start_data.local_server = false;
if (!skip_main_menu) { if (!skip_main_menu) {
// Initialize menu data // Initialize menu data
// TODO: Re-use existing structs (GameStartData) // TODO: Re-use existing structs (GameStartData)
@ -467,6 +466,9 @@ bool ClientLauncher::launch_game(std::string &error_message,
start_data.local_server = !menudata.simple_singleplayer_mode && start_data.local_server = !menudata.simple_singleplayer_mode &&
start_data.address.empty(); start_data.address.empty();
} else {
start_data.local_server = !start_data.world_path.empty() &&
start_data.address.empty() && !start_data.name.empty();
} }
if (!RenderingEngine::run()) if (!RenderingEngine::run())