Move missing translations warnings to verbosestream (#8156)

[oweals/minetest.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index d9073cfb859e59806784b7610b9f97b0441e6c02..26ad978c6f205cb3de34127428b7c73379429207 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "server.h"
 #include "filesys.h"
 #include "version.h"
-#include "game.h"
+#include "client/game.h"
 #include "defaultsettings.h"
 #include "gettext.h"
 #include "log.h"
@@ -289,6 +289,8 @@ static void set_allowed_options(OptionList *allowed_options)
                        _("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
@@ -306,6 +308,8 @@ static void set_allowed_options(OptionList *allowed_options)
                        _("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,
@@ -530,11 +534,8 @@ static bool read_config_file(const Settings &cmd_args)
 
 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");
 
@@ -840,6 +841,9 @@ static bool run_dedicated_server(const GameParams &game_params, const Settings &
        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;
@@ -870,6 +874,7 @@ static bool run_dedicated_server(const GameParams &game_params, const Settings &
                        // Create server
                        Server server(game_params.world_path, game_params.game_spec,
                                        false, bind_addr, true, &iface);
+                       server.init();
 
                        g_term_console.setup(&iface, &kill, admin_nick);
 
@@ -904,6 +909,7 @@ static bool run_dedicated_server(const GameParams &game_params, const Settings &
                        // Create server
                        Server server(game_params.world_path, game_params.game_spec, false,
                                bind_addr, true);
+                       server.init();
                        server.start();
 
                        // Run server