*/
#include "irrlicht.h" // createDevice
-#include "mainmenumanager.h"
#include "irrlichttypes_extrabloated.h"
#include "chat_interface.h"
#include "debug.h"
#include "server.h"
#include "filesys.h"
#include "version.h"
-#include "guiMainMenu.h"
-#include "game.h"
+#include "client/game.h"
#include "defaultsettings.h"
#include "gettext.h"
#include "log.h"
#include "quicktune.h"
#include "httpfetch.h"
-#include "guiEngine.h"
#include "gameparams.h"
-#include "database.h"
+#include "database/database.h"
#include "config.h"
#include "player.h"
#include "porting.h"
#include "terminal_chat_console.h"
#endif
#ifndef SERVER
+#include "gui/guiMainMenu.h"
#include "client/clientlauncher.h"
+#include "gui/guiEngine.h"
+#include "gui/mainmenumanager.h"
#endif
#ifdef HAVE_TOUCHSCREENGUI
- #include "touchscreengui.h"
+ #include "gui/touchscreengui.h"
#endif
#if !defined(SERVER) && \
static void print_allowed_options(const OptionList &allowed_options);
static void print_version();
static void print_worldspecs(const std::vector<WorldSpec> &worldspecs,
- std::ostream &os);
+ std::ostream &os, bool print_name = true, bool print_path = true);
static void print_modified_quicktune_values();
static void list_game_ids();
-static void list_worlds();
+static void list_worlds(bool print_name, bool print_path);
static void setup_log_params(const Settings &cmd_args);
static bool create_userdata_path();
static bool init_common(const Settings &cmd_args, int argc, char *argv[]);
return 0;
}
- // List worlds if requested
- if (cmd_args.exists("world") && cmd_args.get("world") == "list") {
- list_worlds();
+ // List worlds, world names, and world paths if requested
+ if (cmd_args.exists("worldlist")) {
+ if (cmd_args.get("worldlist") == "name") {
+ list_worlds(true, false);
+ } else if (cmd_args.get("worldlist") == "path") {
+ list_worlds(false, true);
+ } else {
+ list_worlds(true, true);
+ }
return 0;
}
allowed_options->insert(std::make_pair("map-dir", ValueSpec(VALUETYPE_STRING,
_("Same as --world (deprecated)"))));
allowed_options->insert(std::make_pair("world", ValueSpec(VALUETYPE_STRING,
- _("Set world path (implies local game) ('list' lists all)"))));
+ _("Set world path (implies local game)"))));
allowed_options->insert(std::make_pair("worldname", ValueSpec(VALUETYPE_STRING,
_("Set world by name (implies local game)"))));
+ allowed_options->insert(std::make_pair("worldlist", ValueSpec(VALUETYPE_STRING,
+ _("Get list of worlds (implies local game) ('path' lists paths, "
+ "'name' lists names, 'both' lists both)"))));
allowed_options->insert(std::make_pair("quiet", ValueSpec(VALUETYPE_FLAG,
_("Print to console errors only"))));
+#if !defined(_WIN32)
+ allowed_options->insert(std::make_pair("color", ValueSpec(VALUETYPE_STRING,
+ _("Coloured logs ('always', 'never' or 'auto'), defaults to 'auto'"
+ ))));
+#else
+ allowed_options->insert(std::make_pair("color", ValueSpec(VALUETYPE_STRING,
+ _("Coloured logs ('always' or 'never'), defaults to 'never'"
+ ))));
+#endif
allowed_options->insert(std::make_pair("info", ValueSpec(VALUETYPE_FLAG,
_("Print more information to console"))));
allowed_options->insert(std::make_pair("verbose", ValueSpec(VALUETYPE_FLAG,
_("Migrate from current map backend to another (Only works when using minetestserver or with --server)"))));
allowed_options->insert(std::make_pair("migrate-players", ValueSpec(VALUETYPE_STRING,
_("Migrate from current players backend to another (Only works when using minetestserver or with --server)"))));
+ allowed_options->insert(std::make_pair("migrate-auth", ValueSpec(VALUETYPE_STRING,
+ _("Migrate from current auth backend to another (Only works when using minetestserver or with --server)"))));
allowed_options->insert(std::make_pair("terminal", ValueSpec(VALUETYPE_FLAG,
_("Feature an interactive terminal (Only works when using minetestserver or with --server)"))));
#ifndef SERVER
_("Set player name"))));
allowed_options->insert(std::make_pair("password", ValueSpec(VALUETYPE_STRING,
_("Set password"))));
+ allowed_options->insert(std::make_pair("password-file", ValueSpec(VALUETYPE_STRING,
+ _("Set password from contents of file"))));
allowed_options->insert(std::make_pair("go", ValueSpec(VALUETYPE_FLAG,
_("Disable main menu"))));
allowed_options->insert(std::make_pair("console", ValueSpec(VALUETYPE_FLAG,
static void print_version()
{
std::cout << PROJECT_NAME_C " " << g_version_hash
- << " (" << porting::getPlatformName() << ")" << std::endl;
+ << " (" << porting::getPlatformName() << ")" << std::endl;
#ifndef SERVER
- std::cout << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl;
+ std::cout << "Using Irrlicht " IRRLICHT_SDK_VERSION << std::endl;
#endif
- std::cout << "Build info: " << g_build_info << std::endl;
+ std::cout << g_build_info << std::endl;
}
static void list_game_ids()
std::cout << gameid <<std::endl;
}
-static void list_worlds()
+static void list_worlds(bool print_name, bool print_path)
{
std::cout << _("Available worlds:") << std::endl;
std::vector<WorldSpec> worldspecs = getAvailableWorlds();
- print_worldspecs(worldspecs, std::cout);
+ print_worldspecs(worldspecs, std::cout, print_name, print_path);
}
static void print_worldspecs(const std::vector<WorldSpec> &worldspecs,
- std::ostream &os)
+ std::ostream &os, bool print_name, bool print_path)
{
for (const WorldSpec &worldspec : worldspecs) {
std::string name = worldspec.name;
std::string path = worldspec.path;
- if (name.find(' ') != std::string::npos)
- name = std::string("'").append(name).append("'");
- path = std::string("'").append(path).append("'");
- name = padStringRight(name, 14);
- os << " " << name << " " << path << std::endl;
+ if (print_name && print_path) {
+ os << "\t" << name << "\t\t" << path << std::endl;
+ } else if (print_name) {
+ os << "\t" << name << std::endl;
+ } else if (print_path) {
+ os << "\t" << path << std::endl;
+ }
}
}
g_logger.addOutputMaxLevel(&stderr_output, LL_ERROR);
}
+ // Coloured log messages (see log.h)
+ if (cmd_args.exists("color")) {
+ std::string mode = cmd_args.get("color");
+ if (mode == "auto")
+ Logger::color_mode = LOG_COLOR_AUTO;
+ else if (mode == "always")
+ Logger::color_mode = LOG_COLOR_ALWAYS;
+ else
+ Logger::color_mode = LOG_COLOR_NEVER;
+ }
+
// If trace is enabled, enable logging of certain things
if (cmd_args.getFlag("trace")) {
dstream << _("Enabling trace level debug output") << std::endl;
static void init_log_streams(const Settings &cmd_args)
{
-#if RUN_IN_PLACE
- std::string log_filename = DEBUGFILE;
-#else
std::string log_filename = porting::path_user + DIR_DELIM + DEBUGFILE;
-#endif
+
if (cmd_args.exists("logfile"))
log_filename = cmd_args.get("logfile");
if (cmd_args.exists("migrate-players"))
return ServerEnvironment::migratePlayersDatabase(game_params, cmd_args);
+ if (cmd_args.exists("migrate-auth"))
+ return ServerEnvironment::migrateAuthDatabase(game_params, cmd_args);
+
if (cmd_args.exists("terminal")) {
#if USE_CURSES
bool name_ok = true;
try {
// Create server
Server server(game_params.world_path, game_params.game_spec,
- false, bind_addr.isIPv6(), true, &iface);
+ false, bind_addr, true, &iface);
+ server.init();
g_term_console.setup(&iface, &kill, admin_nick);
g_term_console.start();
- server.start(bind_addr);
+ server.start();
// Run server
dedicated_server_loop(server, kill);
} catch (const ModError &e) {
try {
// Create server
Server server(game_params.world_path, game_params.game_spec, false,
- bind_addr.isIPv6(), true);
- server.start(bind_addr);
+ bind_addr, true);
+ server.init();
+ server.start();
// Run server
bool &kill = *porting::signal_handler_killstatus();
projects / oweals / minetest.git / blobdiff