luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 17:15:21 +02:00
Code Activity

Improve UX when no game exists and drop default_game (#13550)

Browse Source
This commit is contained in:
ROllerozxa
2023-09-17 19:45:28 +02:00
committed by GitHub
parent 5bfc5d44c0
commit a88e61c2cf
9 changed files with 78 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/clientlauncher.cpp
View File

@@ -397,11 +397,6 @@ bool ClientLauncher::launch_game(std::string &error_message,
spec.path = start_data.world_path;
spec.gameid = getWorldGameId(spec.path, true);
spec.name = _("[--world parameter]");
if (spec.gameid.empty()) { // Create new
spec.gameid = g_settings->get("default_game");
spec.name += " [new]";
}
}
/* Show the GUI menu

1
src/defaultsettings.cpp
View File

@@ -367,7 +367,6 @@ void set_default_settings()
settings->setDefault("max_simultaneous_block_sends_per_client", "40");
settings->setDefault("time_send_interval", "5");
settings->setDefault("default_game", "minetest");
settings->setDefault("motd", "");
settings->setDefault("max_users", "15");
settings->setDefault("creative_mode", "false");

16
src/main.cpp
View File

@@ -994,15 +994,15 @@ static bool determine_subgame(GameParams *game_params)
if (game_params->game_spec.isValid()) {
gamespec = game_params->game_spec;
infostream << "Using commanded gameid [" << gamespec.id << "]" << std::endl;
} else { // Otherwise we will be using "minetest"
gamespec = findSubgame(g_settings->get("default_game"));
infostream << "Using default gameid [" << gamespec.id << "]" << std::endl;
if (!gamespec.isValid()) {
errorstream << "Game specified in default_game ["
<< g_settings->get("default_game")
<< "] is invalid." << std::endl;
return false;
} else {
if (game_params->is_dedicated_server) {
// If this is a dedicated server and no gamespec has been specified,
// print a friendly error pointing to ContentDB.
errorstream << "To run a " PROJECT_NAME_C " server, you need to select a game using the '--gameid' argument." << std::endl
<< "Check out https://content.minetest.net for a selection of games to pick from and download." << std::endl;
}
return false;
}
} else { // World exists
std::string world_gameid = getWorldGameId(game_params->world_path, false);