X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmain.cpp;h=39b441d2c4b1d0879f6d1cf4abacd6852dd50a06;hb=285ba74723695c4b51192dac0e1e17c5d8f880db;hp=201995b5c24787d7df6c71b69416ca40f41ca82d;hpb=a3e019c4f6745d06d7afed7991b9c682b0ea65b9;p=minetest.git diff --git a/src/main.cpp b/src/main.cpp index 201995b5c..39b441d2c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,128 +17,61 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef NDEBUG - /*#ifdef _WIN32 - #pragma message ("Disabling unit tests") - #else - #warning "Disabling unit tests" - #endif*/ - // Disable unit tests - #define ENABLE_TESTS 0 -#else - // Enable unit tests - #define ENABLE_TESTS 1 -#endif - -#ifdef _MSC_VER -#ifndef SERVER // Dedicated server isn't linked with Irrlicht - #pragma comment(lib, "Irrlicht.lib") - // This would get rid of the console window - //#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") -#endif - #pragma comment(lib, "zlibwapi.lib") - #pragma comment(lib, "Shell32.lib") -#endif - +#include "irrlichttypes.h" // must be included before anything irrlicht, see comment in the file #include "irrlicht.h" // createDevice - -#include "main.h" -#include "mainmenumanager.h" -#include -#include -#include #include "irrlichttypes_extrabloated.h" +#include "chat_interface.h" #include "debug.h" -#include "test.h" -#include "clouds.h" +#include "unittest/test.h" #include "server.h" -#include "constants.h" -#include "porting.h" -#include "gettime.h" #include "filesys.h" -#include "config.h" #include "version.h" -#include "guiMainMenu.h" -#include "game.h" -#include "keycode.h" -#include "tile.h" -#include "chat.h" +#include "client/game.h" #include "defaultsettings.h" #include "gettext.h" -#include "settings.h" -#include "profiler.h" #include "log.h" -#include "mods.h" -#if USE_FREETYPE -#include "xCGUITTFont.h" -#endif -#include "util/string.h" -#include "subgame.h" -#include "quicktune.h" -#include "serverlist.h" +#include "util/quicktune.h" #include "httpfetch.h" -#include "guiEngine.h" -#include "mapsector.h" +#include "gameparams.h" +#include "database/database.h" +#include "config.h" #include "player.h" - -#include "database-sqlite3.h" -#ifdef USE_LEVELDB -#include "database-leveldb.h" +#include "porting.h" +#include "network/socket.h" +#if USE_CURSES + #include "terminal_chat_console.h" #endif - -#if USE_REDIS -#include "database-redis.h" +#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 -/* - Settings. - These are loaded from the config file. -*/ -static Settings main_settings; -Settings *g_settings = &main_settings; -std::string g_settings_path; - -// Global profiler -Profiler main_profiler; -Profiler *g_profiler = &main_profiler; - -// Menu clouds are created later -Clouds *g_menuclouds = 0; -irr::scene::ISceneManager *g_menucloudsmgr = 0; - -/* - Debug streams -*/ - -// Connection -std::ostream *dout_con_ptr = &dummyout; -std::ostream *derr_con_ptr = &verbosestream; - -// Server -std::ostream *dout_server_ptr = &infostream; -std::ostream *derr_server_ptr = &errorstream; +// for version information only +extern "C" { +#if USE_LUAJIT + #include +#else + #include +#endif +} -// Client -std::ostream *dout_client_ptr = &infostream; -std::ostream *derr_client_ptr = &errorstream; +#if !defined(SERVER) && \ + (IRRLICHT_VERSION_MAJOR == 1) && \ + (IRRLICHT_VERSION_MINOR == 8) && \ + (IRRLICHT_VERSION_REVISION == 2) + #error "Irrlicht 1.8.2 is known to be broken - please update Irrlicht to version >= 1.8.3" +#endif #define DEBUGFILE "debug.txt" #define DEFAULT_SERVER_PORT 30000 typedef std::map OptionList; -struct GameParams { - u16 socket_port; - std::string world_path; - SubgameSpec game_spec; - bool is_dedicated_server; - int log_level; -}; - /********************************************************************** * Private functions **********************************************************************/ @@ -150,17 +83,17 @@ static void print_help(const OptionList &allowed_options); static void print_allowed_options(const OptionList &allowed_options); static void print_version(); static void print_worldspecs(const std::vector &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 setup_log_params(const Settings &cmd_args); +static void list_worlds(bool print_name, bool print_path); +static bool setup_log_params(const Settings &cmd_args); static bool create_userdata_path(); -static bool init_common(int *log_level, const Settings &cmd_args, int argc, char *argv[]); +static bool init_common(const Settings &cmd_args, int argc, char *argv[]); static void startup_message(); static bool read_config_file(const Settings &cmd_args); -static void init_debug_streams(int *log_level, const Settings &cmd_args); +static void init_log_streams(const Settings &cmd_args); static bool game_configure(GameParams *game_params, const Settings &cmd_args); static void game_configure_port(GameParams *game_params, const Settings &cmd_args); @@ -176,645 +109,58 @@ static bool get_game_from_cmdline(GameParams *game_params, const Settings &cmd_a static bool determine_subgame(GameParams *game_params); static bool run_dedicated_server(const GameParams &game_params, const Settings &cmd_args); -static bool migrate_database(const GameParams &game_params, const Settings &cmd_args, - Server *server); - -#ifndef SERVER -static bool print_video_modes(); -static void speed_tests(); -#endif +static bool migrate_map_database(const GameParams &game_params, const Settings &cmd_args); /**********************************************************************/ -#ifndef SERVER -/* - Random stuff -*/ - -/* mainmenumanager.h */ - -gui::IGUIEnvironment* guienv = NULL; -gui::IGUIStaticText *guiroot = NULL; -MainMenuManager g_menumgr; - -bool noMenuActive() -{ - return (g_menumgr.menuCount() == 0); -} - -// Passed to menus to allow disconnecting and exiting -MainGameCallback *g_gamecallback = NULL; -#endif - -/* - gettime.h implementation -*/ - -#ifdef SERVER - -u32 getTimeMs() -{ - /* Use imprecise system calls directly (from porting.h) */ - return porting::getTime(PRECISION_MILLI); -} - -u32 getTime(TimePrecision prec) -{ - return porting::getTime(prec); -} - -#else - -// A small helper class -class TimeGetter -{ -public: - virtual u32 getTime(TimePrecision prec) = 0; -}; - -// A precise irrlicht one -class IrrlichtTimeGetter: public TimeGetter -{ -public: - IrrlichtTimeGetter(IrrlichtDevice *device): - m_device(device) - {} - u32 getTime(TimePrecision prec) - { - if (prec == PRECISION_MILLI) { - if (m_device == NULL) - return 0; - return m_device->getTimer()->getRealTime(); - } else { - return porting::getTime(prec); - } - } -private: - IrrlichtDevice *m_device; -}; -// Not so precise one which works without irrlicht -class SimpleTimeGetter: public TimeGetter -{ -public: - u32 getTime(TimePrecision prec) - { - return porting::getTime(prec); - } -}; - -// A pointer to a global instance of the time getter -// TODO: why? -TimeGetter *g_timegetter = NULL; - -u32 getTimeMs() -{ - if (g_timegetter == NULL) - return 0; - return g_timegetter->getTime(PRECISION_MILLI); -} - -u32 getTime(TimePrecision prec) { - if (g_timegetter == NULL) - return 0; - return g_timegetter->getTime(prec); -} -#endif - -class StderrLogOutput: public ILogOutput -{ -public: - /* line: Full line with timestamp, level and thread */ - void printLog(const std::string &line) - { - std::cerr << line << std::endl; - } -} main_stderr_log_out; - -class DstreamNoStderrLogOutput: public ILogOutput -{ -public: - /* line: Full line with timestamp, level and thread */ - void printLog(const std::string &line) - { - dstream_no_stderr << line << std::endl; - } -} main_dstream_no_stderr_log_out; - -#ifndef SERVER - -/* - Event handler for Irrlicht - - NOTE: Everything possible should be moved out from here, - probably to InputHandler and the_game -*/ - -class MyEventReceiver : public IEventReceiver -{ -public: - // This is the one method that we have to implement - virtual bool OnEvent(const SEvent& event) - { - /* - React to nothing here if a menu is active - */ - if (noMenuActive() == false) { -#ifdef HAVE_TOUCHSCREENGUI - if (m_touchscreengui != 0) { - m_touchscreengui->Toggle(false); - } -#endif - return g_menumgr.preprocessEvent(event); - } - - // Remember whether each key is down or up - if (event.EventType == irr::EET_KEY_INPUT_EVENT) { - if (event.KeyInput.PressedDown) { - keyIsDown.set(event.KeyInput); - keyWasDown.set(event.KeyInput); - } else { - keyIsDown.unset(event.KeyInput); - } - } - -#ifdef HAVE_TOUCHSCREENGUI - // case of touchscreengui we have to handle different events - if ((m_touchscreengui != 0) && - (event.EventType == irr::EET_TOUCH_INPUT_EVENT)) { - m_touchscreengui->translateEvent(event); - return true; - } -#endif - // handle mouse events - if (event.EventType == irr::EET_MOUSE_INPUT_EVENT) { - if (noMenuActive() == false) { - left_active = false; - middle_active = false; - right_active = false; - } else { - left_active = event.MouseInput.isLeftPressed(); - middle_active = event.MouseInput.isMiddlePressed(); - right_active = event.MouseInput.isRightPressed(); - - if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) { - leftclicked = true; - } - if (event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN) { - rightclicked = true; - } - if (event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP) { - leftreleased = true; - } - if (event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP) { - rightreleased = true; - } - if (event.MouseInput.Event == EMIE_MOUSE_WHEEL) { - mouse_wheel += event.MouseInput.Wheel; - } - } - } - if (event.EventType == irr::EET_LOG_TEXT_EVENT) { - dstream << std::string("Irrlicht log: ") + std::string(event.LogEvent.Text) - << std::endl; - return true; - } - /* always return false in order to continue processing events */ - return false; - } - - bool IsKeyDown(const KeyPress &keyCode) const - { - return keyIsDown[keyCode]; - } - - // Checks whether a key was down and resets the state - bool WasKeyDown(const KeyPress &keyCode) - { - bool b = keyWasDown[keyCode]; - if (b) - keyWasDown.unset(keyCode); - return b; - } - - s32 getMouseWheel() - { - s32 a = mouse_wheel; - mouse_wheel = 0; - return a; - } - - void clearInput() - { - keyIsDown.clear(); - keyWasDown.clear(); - - leftclicked = false; - rightclicked = false; - leftreleased = false; - rightreleased = false; - - left_active = false; - middle_active = false; - right_active = false; - - mouse_wheel = 0; - } - - MyEventReceiver() - { - clearInput(); -#ifdef HAVE_TOUCHSCREENGUI - m_touchscreengui = NULL; -#endif - } - - bool leftclicked; - bool rightclicked; - bool leftreleased; - bool rightreleased; - - bool left_active; - bool middle_active; - bool right_active; - - s32 mouse_wheel; - -#ifdef HAVE_TOUCHSCREENGUI - TouchScreenGUI* m_touchscreengui; -#endif - -private: - // The current state of keys - KeyList keyIsDown; - // Whether a key has been pressed or not - KeyList keyWasDown; -}; -/* - Separated input handler -*/ - -class RealInputHandler : public InputHandler -{ -public: - RealInputHandler(IrrlichtDevice *device, MyEventReceiver *receiver): - m_device(device), - m_receiver(receiver), - m_mousepos(0,0) - { - } - virtual bool isKeyDown(const KeyPress &keyCode) - { - return m_receiver->IsKeyDown(keyCode); - } - virtual bool wasKeyDown(const KeyPress &keyCode) - { - return m_receiver->WasKeyDown(keyCode); - } - virtual v2s32 getMousePos() - { - if (m_device->getCursorControl()) { - return m_device->getCursorControl()->getPosition(); - } - else { - return m_mousepos; - } - } - virtual void setMousePos(s32 x, s32 y) - { - if (m_device->getCursorControl()) { - m_device->getCursorControl()->setPosition(x, y); - } - else { - m_mousepos = v2s32(x,y); - } - } - - virtual bool getLeftState() - { - return m_receiver->left_active; - } - virtual bool getRightState() - { - return m_receiver->right_active; - } - - virtual bool getLeftClicked() - { - return m_receiver->leftclicked; - } - virtual bool getRightClicked() - { - return m_receiver->rightclicked; - } - virtual void resetLeftClicked() - { - m_receiver->leftclicked = false; - } - virtual void resetRightClicked() - { - m_receiver->rightclicked = false; - } - - virtual bool getLeftReleased() - { - return m_receiver->leftreleased; - } - virtual bool getRightReleased() - { - return m_receiver->rightreleased; - } - virtual void resetLeftReleased() - { - m_receiver->leftreleased = false; - } - virtual void resetRightReleased() - { - m_receiver->rightreleased = false; - } - - virtual s32 getMouseWheel() - { - return m_receiver->getMouseWheel(); - } - - void clear() - { - m_receiver->clearInput(); - } -private: - IrrlichtDevice *m_device; - MyEventReceiver *m_receiver; - v2s32 m_mousepos; -}; - -class RandomInputHandler : public InputHandler -{ -public: - RandomInputHandler() - { - leftdown = false; - rightdown = false; - leftclicked = false; - rightclicked = false; - leftreleased = false; - rightreleased = false; - keydown.clear(); - } - virtual bool isKeyDown(const KeyPress &keyCode) - { - return keydown[keyCode]; - } - virtual bool wasKeyDown(const KeyPress &keyCode) - { - return false; - } - virtual v2s32 getMousePos() - { - return mousepos; - } - virtual void setMousePos(s32 x, s32 y) - { - mousepos = v2s32(x, y); - } - - virtual bool getLeftState() - { - return leftdown; - } - virtual bool getRightState() - { - return rightdown; - } - - virtual bool getLeftClicked() - { - return leftclicked; - } - virtual bool getRightClicked() - { - return rightclicked; - } - virtual void resetLeftClicked() - { - leftclicked = false; - } - virtual void resetRightClicked() - { - rightclicked = false; - } - - virtual bool getLeftReleased() - { - return leftreleased; - } - virtual bool getRightReleased() - { - return rightreleased; - } - virtual void resetLeftReleased() - { - leftreleased = false; - } - virtual void resetRightReleased() - { - rightreleased = false; - } - - virtual s32 getMouseWheel() - { - return 0; - } - - virtual void step(float dtime) - { - { - static float counter1 = 0; - counter1 -= dtime; - if (counter1 < 0.0) { - counter1 = 0.1 * Rand(1, 40); - keydown.toggle(getKeySetting("keymap_jump")); - } - } - { - static float counter1 = 0; - counter1 -= dtime; - if (counter1 < 0.0) { - counter1 = 0.1 * Rand(1, 40); - keydown.toggle(getKeySetting("keymap_special1")); - } - } - { - static float counter1 = 0; - counter1 -= dtime; - if (counter1 < 0.0) { - counter1 = 0.1 * Rand(1, 40); - keydown.toggle(getKeySetting("keymap_forward")); - } - } - { - static float counter1 = 0; - counter1 -= dtime; - if (counter1 < 0.0) { - counter1 = 0.1 * Rand(1, 40); - keydown.toggle(getKeySetting("keymap_left")); - } - } - { - static float counter1 = 0; - counter1 -= dtime; - if (counter1 < 0.0) { - counter1 = 0.1 * Rand(1, 20); - mousespeed = v2s32(Rand(-20, 20), Rand(-15, 20)); - } - } - { - static float counter1 = 0; - counter1 -= dtime; - if (counter1 < 0.0) { - counter1 = 0.1 * Rand(1, 30); - leftdown = !leftdown; - if (leftdown) - leftclicked = true; - if (!leftdown) - leftreleased = true; - } - } - { - static float counter1 = 0; - counter1 -= dtime; - if (counter1 < 0.0) { - counter1 = 0.1 * Rand(1, 15); - rightdown = !rightdown; - if (rightdown) - rightclicked = true; - if (!rightdown) - rightreleased = true; - } - } - mousepos += mousespeed; - } - - s32 Rand(s32 min, s32 max) - { - return (myrand()%(max-min+1))+min; - } -private: - KeyList keydown; - v2s32 mousepos; - v2s32 mousespeed; - bool leftdown; - bool rightdown; - bool leftclicked; - bool rightclicked; - bool leftreleased; - bool rightreleased; -}; - - -class ClientLauncher -{ -public: - ClientLauncher() : - list_video_modes(false), - skip_main_menu(false), - use_freetype(false), - random_input(false), - address(""), - playername(""), - password(""), - device(NULL), - input(NULL), - receiver(NULL), - skin(NULL), - font(NULL), - simple_singleplayer_mode(false), - current_playername("inv£lid"), - current_password(""), - current_address("does-not-exist"), - current_port(0) - {} - - ~ClientLauncher(); - - bool run(GameParams &game_params, const Settings &cmd_args); - -protected: - void init_args(GameParams &game_params, const Settings &cmd_args); - bool init_engine(int log_level); - - bool launch_game(std::wstring *error_message, GameParams &game_params, - const Settings &cmd_args); - - void main_menu(MainMenuData *menudata); - bool create_engine_device(int log_level); - - bool list_video_modes; - bool skip_main_menu; - bool use_freetype; - bool random_input; - std::string address; - std::string playername; - std::string password; - IrrlichtDevice *device; - InputHandler *input; - MyEventReceiver *receiver; - gui::IGUISkin *skin; - gui::IGUIFont *font; - scene::ISceneManager *smgr; - SubgameSpec gamespec; - WorldSpec worldspec; - bool simple_singleplayer_mode; - - // 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; - std::string current_password; - std::string current_address; - int current_port; -}; - -#endif // !SERVER +FileLogOutput file_log_output; static OptionList allowed_options; int main(int argc, char *argv[]) { int retval; + debug_set_exception_handler(); - log_add_output_maxlev(&main_stderr_log_out, LMT_ACTION); - log_add_output_all_levs(&main_dstream_no_stderr_log_out); - - log_register_thread("main"); + g_logger.registerThread("Main"); + g_logger.addOutputMaxLevel(&stderr_output, LL_ACTION); Settings cmd_args; bool cmd_args_ok = get_cmdline_opts(argc, argv, &cmd_args); if (!cmd_args_ok || cmd_args.getFlag("help") || cmd_args.exists("nonopt1")) { + porting::attachOrCreateConsole(); print_help(allowed_options); return cmd_args_ok ? 0 : 1; } + if (cmd_args.getFlag("console")) + porting::attachOrCreateConsole(); if (cmd_args.getFlag("version")) { + porting::attachOrCreateConsole(); print_version(); return 0; } - setup_log_params(cmd_args); + if (!setup_log_params(cmd_args)) + return 1; porting::signal_handler_init(); + +#ifdef __ANDROID__ + porting::initAndroid(); + porting::initializePathsAndroid(); +#else porting::initializePaths(); +#endif if (!create_userdata_path()) { errorstream << "Cannot create user data directory" << std::endl; return 1; } - // Initialize debug stacks - debug_stacks_init(); - DSTACK(__FUNCTION_NAME); - // Debug handler BEGIN_DEBUG_EXCEPTION_HANDLER @@ -824,41 +170,56 @@ int main(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 if (cmd_args.get("worldlist") == "both") { + list_worlds(true, true); + } else { + errorstream << "Invalid --worldlist value: " + << cmd_args.get("worldlist") << std::endl; + return 1; + } return 0; } - GameParams game_params; - if (!init_common(&game_params.log_level, cmd_args, argc, argv)) + if (!init_common(cmd_args, argc, argv)) return 1; + if (g_settings->getBool("enable_console")) + porting::attachOrCreateConsole(); + #ifndef __ANDROID__ // Run unit tests - if ((ENABLE_TESTS && cmd_args.getFlag("disable-unittests") == false) - || cmd_args.getFlag("enable-unittests") == true) { - run_tests(); + if (cmd_args.getFlag("run-unittests")) { +#if BUILD_UNITTESTS + return run_tests(); +#else + errorstream << "Unittest support is not enabled in this binary. " + << "If you want to enable it, compile project with BUILD_UNITTESTS=1 flag." + << std::endl; +#endif } #endif + GameStartData game_params; #ifdef SERVER + porting::attachOrCreateConsole(); game_params.is_dedicated_server = true; #else - game_params.is_dedicated_server = cmd_args.getFlag("server"); + const bool isServer = cmd_args.getFlag("server"); + if (isServer) + porting::attachOrCreateConsole(); + game_params.is_dedicated_server = isServer; #endif if (!game_configure(&game_params, cmd_args)) return 1; - assert(game_params.world_path != ""); - - infostream << "Using commanded world path [" - << game_params.world_path << "]" << std::endl; - - //Run dedicated server if asked to or no other option - g_settings->set("server_dedicated", - game_params.is_dedicated_server ? "true" : "false"); + sanity_check(!game_params.world_path.empty()); if (game_params.is_dedicated_server) return run_dedicated_server(game_params, cmd_args) ? 0 : 1; @@ -871,7 +232,7 @@ int main(int argc, char *argv[]) #endif // Update configuration file - if (g_settings_path != "") + if (!g_settings_path.empty()) g_settings->updateConfigFile(g_settings_path.c_str()); print_modified_quicktune_values(); @@ -879,7 +240,7 @@ int main(int argc, char *argv[]) // Stop httpfetch thread (if started) httpfetch_cleanup(); - END_DEBUG_EXCEPTION_HANDLER(errorstream) + END_DEBUG_EXCEPTION_HANDLER return retval; } @@ -909,18 +270,22 @@ static void set_allowed_options(OptionList *allowed_options) _("Load configuration from specified file")))); allowed_options->insert(std::make_pair("port", ValueSpec(VALUETYPE_STRING, _("Set network port (UDP)")))); - allowed_options->insert(std::make_pair("disable-unittests", ValueSpec(VALUETYPE_FLAG, - _("Disable unit tests")))); - allowed_options->insert(std::make_pair("enable-unittests", ValueSpec(VALUETYPE_FLAG, - _("Enable unit tests")))); + allowed_options->insert(std::make_pair("run-unittests", ValueSpec(VALUETYPE_FLAG, + _("Run the unit tests and exit")))); 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 if used with option --go)")))); allowed_options->insert(std::make_pair("worldname", ValueSpec(VALUETYPE_STRING, - _("Set world by name (implies local game)")))); + _("Set world by name (implies local game if used with option --go)")))); + allowed_options->insert(std::make_pair("worldlist", ValueSpec(VALUETYPE_STRING, + _("Get list of worlds ('path' lists paths, " + "'name' lists names, 'both' lists both)")))); allowed_options->insert(std::make_pair("quiet", ValueSpec(VALUETYPE_FLAG, _("Print to console errors only")))); + allowed_options->insert(std::make_pair("color", ValueSpec(VALUETYPE_STRING, + _("Coloured logs ('always', 'never' or 'auto'), defaults to 'auto'" + )))); 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, @@ -933,6 +298,12 @@ static void set_allowed_options(OptionList *allowed_options) _("Set gameid (\"--gameid list\" prints available ones)")))); allowed_options->insert(std::make_pair("migrate", ValueSpec(VALUETYPE_STRING, _("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 allowed_options->insert(std::make_pair("videomodes", ValueSpec(VALUETYPE_FLAG, _("Show available video modes")))); @@ -948,73 +319,81 @@ 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, + _("Starts with the console (Windows only)")))); #endif } static void print_help(const OptionList &allowed_options) { - dstream << _("Allowed options:") << std::endl; + std::cout << _("Allowed options:") << std::endl; print_allowed_options(allowed_options); } static void print_allowed_options(const OptionList &allowed_options) { - for (OptionList::const_iterator i = allowed_options.begin(); - i != allowed_options.end(); ++i) { + for (const auto &allowed_option : allowed_options) { std::ostringstream os1(std::ios::binary); - os1 << " --" << i->first; - if (i->second.type != VALUETYPE_FLAG) + os1 << " --" << allowed_option.first; + if (allowed_option.second.type != VALUETYPE_FLAG) os1 << _(" "); - dstream << padStringRight(os1.str(), 24); + std::cout << padStringRight(os1.str(), 30); - if (i->second.help != NULL) - dstream << i->second.help; + if (allowed_option.second.help) + std::cout << allowed_option.second.help; - dstream << std::endl; + std::cout << std::endl; } } static void print_version() { -#ifdef SERVER - dstream << "minetestserver " << minetest_version_hash << std::endl; + std::cout << PROJECT_NAME_C " " << g_version_hash + << " (" << porting::getPlatformName() << ")" << std::endl; +#ifndef SERVER + std::cout << "Using Irrlicht " IRRLICHT_SDK_VERSION << std::endl; +#endif +#if USE_LUAJIT + std::cout << "Using " << LUAJIT_VERSION << std::endl; #else - dstream << "Minetest " << minetest_version_hash << std::endl; - dstream << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl; + std::cout << "Using " << LUA_RELEASE << std::endl; #endif - dstream << "Build info: " << minetest_build_info << std::endl; + std::cout << g_build_info << std::endl; } static void list_game_ids() { std::set gameids = getAvailableGameIds(); - for (std::set::const_iterator i = gameids.begin(); - i != gameids.end(); i++) - dstream << (*i) < worldspecs = getAvailableWorlds(); - print_worldspecs(worldspecs, dstream); + print_worldspecs(worldspecs, std::cout, print_name, print_path); } static void print_worldspecs(const std::vector &worldspecs, - std::ostream &os) + std::ostream &os, bool print_name, bool print_path) { - for (size_t i = 0; i < worldspecs.size(); i++) { - std::string name = worldspecs[i].name; - std::string path = worldspecs[i].path; - if (name.find(" ") != std::string::npos) - name = std::string("'") + name + "'"; - path = std::string("'") + path + "'"; - name = padStringRight(name, 14); - os << " " << name << " " << path << std::endl; + for (const WorldSpec &worldspec : worldspecs) { + std::string name = worldspec.name; + std::string path = worldspec.path; + 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; + } } } @@ -1023,42 +402,68 @@ static void print_modified_quicktune_values() bool header_printed = false; std::vector names = getQuicktuneNames(); - for (u32 i = 0; i < names.size(); i++) { - QuicktuneValue val = getQuicktuneValue(names[i]); + for (const std::string &name : names) { + QuicktuneValue val = getQuicktuneValue(name); if (!val.modified) continue; if (!header_printed) { dstream << "Modified quicktune values:" << std::endl; header_printed = true; } - dstream << names[i] << " = " << val.getString() << std::endl; + dstream << name << " = " << val.getString() << std::endl; } } -static void setup_log_params(const Settings &cmd_args) +static bool setup_log_params(const Settings &cmd_args) { // Quiet mode, print errors only if (cmd_args.getFlag("quiet")) { - log_remove_output(&main_stderr_log_out); - log_add_output_maxlev(&main_stderr_log_out, LMT_ERROR); + g_logger.removeOutput(&stderr_output); + g_logger.addOutputMaxLevel(&stderr_output, LL_ERROR); + } + + // Coloured log messages (see log.h) + std::string color_mode; + if (cmd_args.exists("color")) { + color_mode = cmd_args.get("color"); +#if !defined(_WIN32) + } else { + char *color_mode_env = getenv("MT_LOGCOLOR"); + if (color_mode_env) + color_mode = color_mode_env; +#endif + } + if (color_mode != "") { + if (color_mode == "auto") { + Logger::color_mode = LOG_COLOR_AUTO; + } else if (color_mode == "always") { + Logger::color_mode = LOG_COLOR_ALWAYS; + } else if (color_mode == "never") { + Logger::color_mode = LOG_COLOR_NEVER; + } else { + errorstream << "Invalid color mode: " << color_mode << std::endl; + return false; + } } // If trace is enabled, enable logging of certain things if (cmd_args.getFlag("trace")) { dstream << _("Enabling trace level debug output") << std::endl; - log_trace_level_enabled = true; - dout_con_ptr = &verbosestream; // this is somewhat old crap - socket_enable_debug_output = true; // socket doesn't use log.h + g_logger.setTraceEnabled(true); + dout_con_ptr = &verbosestream; // This is somewhat old + socket_enable_debug_output = true; // Sockets doesn't use log.h } // In certain cases, output info level on stderr if (cmd_args.getFlag("info") || cmd_args.getFlag("verbose") || cmd_args.getFlag("trace") || cmd_args.getFlag("speedtests")) - log_add_output(&main_stderr_log_out, LMT_INFO); + g_logger.addOutput(&stderr_output, LL_INFO); // In certain cases, output verbose level on stderr if (cmd_args.getFlag("verbose") || cmd_args.getFlag("trace")) - log_add_output(&main_stderr_log_out, LMT_VERBOSE); + g_logger.addOutput(&stderr_output, LL_VERBOSE); + + return true; } static bool create_userdata_path() @@ -1066,39 +471,35 @@ static bool create_userdata_path() bool success; #ifdef __ANDROID__ - porting::initAndroid(); - - porting::setExternalStorageDir(porting::jnienv); if (!fs::PathExists(porting::path_user)) { success = fs::CreateDir(porting::path_user); } else { success = true; } - porting::copyAssets(); #else // Create user data directory success = fs::CreateDir(porting::path_user); #endif - infostream << "path_share = " << porting::path_share << std::endl; - infostream << "path_user = " << porting::path_user << std::endl; - return success; } -static bool init_common(int *log_level, const Settings &cmd_args, int argc, char *argv[]) +static bool init_common(const Settings &cmd_args, int argc, char *argv[]) { startup_message(); - set_default_settings(g_settings); + set_default_settings(); // Initialize sockets sockets_init(); atexit(sockets_cleanup); + // Initialize g_settings + Settings::createLayer(SL_GLOBAL); + if (!read_config_file(cmd_args)) return false; - init_debug_streams(log_level, cmd_args); + init_log_streams(cmd_args); // Initialize random seed srand(time(0)); @@ -1107,13 +508,8 @@ static bool init_common(int *log_level, const Settings &cmd_args, int argc, char // Initialize HTTP fetcher httpfetch_init(g_settings->getS32("curl_parallel_limit")); -#ifdef _MSC_VER - init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(), + init_gettext(porting::path_locale.c_str(), g_settings->get("language"), argc, argv); -#else - init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(), - g_settings->get("language")); -#endif return true; } @@ -1123,13 +519,13 @@ static void startup_message() infostream << PROJECT_NAME << " " << _("with") << " SER_FMT_VER_HIGHEST_READ=" << (int)SER_FMT_VER_HIGHEST_READ << ", " - << minetest_build_info << std::endl; + << g_build_info << std::endl; } static bool read_config_file(const Settings &cmd_args) { // Path of configuration file in use - assert(g_settings_path == ""); // Sanity check + sanity_check(g_settings_path == ""); // Sanity check if (cmd_args.exists("config")) { bool r = g_settings->readConfigFile(cmd_args.get("config").c_str()); @@ -1153,54 +549,59 @@ static bool read_config_file(const Settings &cmd_args) DIR_DELIM + ".." + DIR_DELIM + ".." + DIR_DELIM + "minetest.conf"); #endif - for (size_t i = 0; i < filenames.size(); i++) { - bool r = g_settings->readConfigFile(filenames[i].c_str()); + for (const std::string &filename : filenames) { + bool r = g_settings->readConfigFile(filename.c_str()); if (r) { - g_settings_path = filenames[i]; + g_settings_path = filename; break; } } // If no path found, use the first one (menu creates the file) - if (g_settings_path == "") + if (g_settings_path.empty()) g_settings_path = filenames[0]; } return true; } -static void init_debug_streams(int *log_level, const Settings &cmd_args) +static void init_log_streams(const Settings &cmd_args) { -#if RUN_IN_PLACE - std::string logfile = DEBUGFILE; -#else - std::string logfile = porting::path_user + DIR_DELIM + DEBUGFILE; -#endif + std::string log_filename = porting::path_user + DIR_DELIM + DEBUGFILE; + if (cmd_args.exists("logfile")) - logfile = cmd_args.get("logfile"); - - log_remove_output(&main_dstream_no_stderr_log_out); - *log_level = g_settings->getS32("debug_log_level"); - - if (*log_level == 0) //no logging - logfile = ""; - if (*log_level < 0) { - dstream << "WARNING: Supplied debug_log_level < 0; Using 0" << std::endl; - *log_level = 0; - } else if (*log_level > LMT_NUM_VALUES) { - dstream << "WARNING: Supplied debug_log_level > " << LMT_NUM_VALUES - << "; Using " << LMT_NUM_VALUES << std::endl; - *log_level = LMT_NUM_VALUES; + log_filename = cmd_args.get("logfile"); + + g_logger.removeOutput(&file_log_output); + std::string conf_loglev = g_settings->get("debug_log_level"); + + // Old integer format + if (std::isdigit(conf_loglev[0])) { + warningstream << "Deprecated use of debug_log_level with an " + "integer value; please update your configuration." << std::endl; + static const char *lev_name[] = + {"", "error", "action", "info", "verbose"}; + int lev_i = atoi(conf_loglev.c_str()); + if (lev_i < 0 || lev_i >= (int)ARRLEN(lev_name)) { + warningstream << "Supplied invalid debug_log_level!" + " Assuming action level." << std::endl; + lev_i = 2; + } + conf_loglev = lev_name[lev_i]; } - log_add_output_maxlev(&main_dstream_no_stderr_log_out, - (LogMessageLevel)(*log_level - 1)); - - debugstreams_init(false, logfile == "" ? NULL : logfile.c_str()); + if (log_filename.empty() || conf_loglev.empty()) // No logging + return; - infostream << "logfile = " << logfile << std::endl; + LogLevel log_level = Logger::stringToLevel(conf_loglev); + if (log_level == LL_MAX) { + warningstream << "Supplied unrecognized debug_log_level; " + "using maximum." << std::endl; + } - atexit(debugstreams_deinit); + file_log_output.setFile(log_filename, + g_settings->getU64("debug_log_size_max") * 1000000); + g_logger.addOutputMaxLevel(&file_log_output, log_level); } static bool game_configure(GameParams *game_params, const Settings &cmd_args) @@ -1219,10 +620,14 @@ static bool game_configure(GameParams *game_params, const Settings &cmd_args) static void game_configure_port(GameParams *game_params, const Settings &cmd_args) { - if (cmd_args.exists("port")) + if (cmd_args.exists("port")) { game_params->socket_port = cmd_args.getU16("port"); - else - game_params->socket_port = g_settings->getU16("port"); + } else { + if (game_params->is_dedicated_server) + game_params->socket_port = g_settings->getU16("port"); + else + game_params->socket_port = g_settings->getU16("remote_port"); + } if (game_params->socket_port == 0) game_params->socket_port = DEFAULT_SERVER_PORT; @@ -1232,6 +637,7 @@ static bool game_configure_world(GameParams *game_params, const Settings &cmd_ar { if (get_world_from_cmdline(game_params, cmd_args)) return true; + if (get_world_from_config(game_params, cmd_args)) return true; @@ -1240,24 +646,24 @@ static bool game_configure_world(GameParams *game_params, const Settings &cmd_ar static bool get_world_from_cmdline(GameParams *game_params, const Settings &cmd_args) { - std::string commanded_world = ""; + std::string commanded_world; // World name - std::string commanded_worldname = ""; + std::string commanded_worldname; if (cmd_args.exists("worldname")) commanded_worldname = cmd_args.get("worldname"); // If a world name was specified, convert it to a path - if (commanded_worldname != "") { + if (!commanded_worldname.empty()) { // Get information about available worlds std::vector worldspecs = getAvailableWorlds(); bool found = false; - for (u32 i = 0; i < worldspecs.size(); i++) { - std::string name = worldspecs[i].name; + for (const WorldSpec &worldspec : worldspecs) { + std::string name = worldspec.name; if (name == commanded_worldname) { dstream << _("Using world specified by --worldname on the " "command line") << std::endl; - commanded_world = worldspecs[i].path; + commanded_world = worldspec.path; found = true; break; } @@ -1270,7 +676,7 @@ static bool get_world_from_cmdline(GameParams *game_params, const Settings &cmd_ } game_params->world_path = get_clean_world_path(commanded_world); - return commanded_world != ""; + return !commanded_world.empty(); } if (cmd_args.exists("world")) @@ -1281,20 +687,20 @@ static bool get_world_from_cmdline(GameParams *game_params, const Settings &cmd_ commanded_world = cmd_args.get("nonopt0"); game_params->world_path = get_clean_world_path(commanded_world); - return commanded_world != ""; + return !commanded_world.empty(); } static bool get_world_from_config(GameParams *game_params, const Settings &cmd_args) { // World directory - std::string commanded_world = ""; + std::string commanded_world; if (g_settings->exists("map-dir")) commanded_world = g_settings->get("map-dir"); game_params->world_path = get_clean_world_path(commanded_world); - return commanded_world != ""; + return !commanded_world.empty(); } static bool auto_select_world(GameParams *game_params) @@ -1302,8 +708,6 @@ static bool auto_select_world(GameParams *game_params) // No world was specified; try to select it automatically // Get information about available worlds - verbosestream << _("Determining world path") << std::endl; - std::vector worldspecs = getAvailableWorlds(); std::string world_path; @@ -1314,21 +718,21 @@ static bool auto_select_world(GameParams *game_params) << world_path << "]" << std::endl; // If there are multiple worlds, list them } else if (worldspecs.size() > 1 && game_params->is_dedicated_server) { - dstream << _("Multiple worlds are available.") << std::endl; - dstream << _("Please select one using --worldname " + std::cerr << _("Multiple worlds are available.") << std::endl; + std::cerr << _("Please select one using --worldname " " or --world ") << std::endl; - print_worldspecs(worldspecs, dstream); + print_worldspecs(worldspecs, std::cerr); return false; // If there are no worlds, automatically create a new one } else { // This is the ultimate default world path world_path = porting::path_user + DIR_DELIM + "worlds" + DIR_DELIM + "world"; - infostream << "Creating default world at [" + infostream << "Using default world at [" << world_path << "]" << std::endl; } - assert(world_path != ""); + assert(world_path != ""); // Post-condition game_params->world_path = world_path; return true; } @@ -1384,12 +788,11 @@ static bool determine_subgame(GameParams *game_params) { SubgameSpec gamespec; - assert(game_params->world_path != ""); // pre-condition + assert(game_params->world_path != ""); // Pre-condition - verbosestream << _("Determining gameid/gamespec") << std::endl; // If world doesn't exist - if (game_params->world_path != "" - && !getWorldExists(game_params->world_path)) { + if (!game_params->world_path.empty() + && !getWorldExists(game_params->world_path)) { // Try to take gamespec from command line if (game_params->game_spec.isValid()) { gamespec = game_params->game_spec; @@ -1397,6 +800,12 @@ static bool determine_subgame(GameParams *game_params) } 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 { // World exists std::string world_gameid = getWorldGameId(game_params->world_path, false); @@ -1404,7 +813,7 @@ static bool determine_subgame(GameParams *game_params) if (game_params->game_spec.isValid()) { gamespec = game_params->game_spec; if (game_params->game_spec.id != world_gameid) { - errorstream << "WARNING: Using commanded gameid [" + warningstream << "Using commanded gameid [" << gamespec.id << "]" << " instead of world gameid [" << world_gameid << "]" << std::endl; } @@ -1417,7 +826,7 @@ static bool determine_subgame(GameParams *game_params) } if (!gamespec.isValid()) { - errorstream << "Subgame [" << gamespec.id << "] could not be found." + errorstream << "Game [" << gamespec.id << "] could not be found." << std::endl; return false; } @@ -1432,8 +841,6 @@ static bool determine_subgame(GameParams *game_params) *****************************************************************************/ static bool run_dedicated_server(const GameParams &game_params, const Settings &cmd_args) { - DSTACK("Dedicated server branch"); - verbosestream << _("Using world path") << " [" << game_params.world_path << "]" << std::endl; verbosestream << _("Using gameid") << " [" @@ -1460,807 +867,162 @@ static bool run_dedicated_server(const GameParams &game_params, const Settings & return false; } - // Create server - Server server(game_params.world_path, - game_params.game_spec, false, bind_addr.isIPv6()); - // Database migration if (cmd_args.exists("migrate")) - return migrate_database(game_params, cmd_args, &server); + return migrate_map_database(game_params, cmd_args); - server.start(bind_addr); + if (cmd_args.exists("migrate-players")) + return ServerEnvironment::migratePlayersDatabase(game_params, cmd_args); - // Run server - bool &kill = *porting::signal_handler_killstatus(); - dedicated_server_loop(server, kill); + if (cmd_args.exists("migrate-auth")) + return ServerEnvironment::migrateAuthDatabase(game_params, cmd_args); - return true; -} + if (cmd_args.exists("terminal")) { +#if USE_CURSES + bool name_ok = true; + std::string admin_nick = g_settings->get("name"); -static bool migrate_database(const GameParams &game_params, const Settings &cmd_args, - Server *server) -{ - Settings world_mt; - bool success = world_mt.readConfigFile((game_params.world_path - + DIR_DELIM + "world.mt").c_str()); - if (!success) { - errorstream << "Cannot read world.mt" << std::endl; - return false; - } + name_ok = name_ok && !admin_nick.empty(); + name_ok = name_ok && string_allowed(admin_nick, PLAYERNAME_ALLOWED_CHARS); - if (!world_mt.exists("backend")) { - errorstream << "Please specify your current backend in world.mt file:" - << std::endl << " backend = {sqlite3|leveldb|redis|dummy}" - << std::endl; - return false; - } - - std::string backend = world_mt.get("backend"); - Database *new_db; - std::string migrate_to = cmd_args.get("migrate"); - - if (backend == migrate_to) { - errorstream << "Cannot migrate: new backend is same as the old one" - << std::endl; - return false; - } - - if (migrate_to == "sqlite3") - new_db = new Database_SQLite3(&(ServerMap&)server->getMap(), - game_params.world_path); -#if USE_LEVELDB - else if (migrate_to == "leveldb") - new_db = new Database_LevelDB(&(ServerMap&)server->getMap(), - game_params.world_path); -#endif -#if USE_REDIS - else if (migrate_to == "redis") - new_db = new Database_Redis(&(ServerMap&)server->getMap(), - game_params.world_path); -#endif - else { - errorstream << "Migration to " << migrate_to << " is not supported" - << std::endl; - return false; - } - - std::list blocks; - ServerMap &old_map = ((ServerMap&)server->getMap()); - old_map.listAllLoadableBlocks(blocks); - int count = 0; - new_db->beginSave(); - for (std::list::iterator i = blocks.begin(); i != blocks.end(); i++) { - MapBlock *block = old_map.loadBlock(*i); - if (!block) { - errorstream << "Failed to load block " << PP(*i) << ", skipping it."; - } else { - old_map.saveBlock(block, new_db); - MapSector *sector = old_map.getSectorNoGenerate(v2s16(i->X, i->Z)); - sector->deleteBlock(block); - } - ++count; - if (count % 500 == 0) - actionstream << "Migrated " << count << " blocks " - << (100.0 * count / blocks.size()) << "% completed" << std::endl; - } - new_db->endSave(); - delete new_db; - - actionstream << "Successfully migrated " << count << " blocks" << std::endl; - world_mt.set("backend", migrate_to); - if (!world_mt.updateConfigFile( - (game_params.world_path+ DIR_DELIM + "world.mt").c_str())) - errorstream << "Failed to update world.mt!" << std::endl; - else - actionstream << "world.mt updated" << std::endl; - - return true; -} - - -/***************************************************************************** - * Client - *****************************************************************************/ -#ifndef SERVER - -ClientLauncher::~ClientLauncher() -{ - if (receiver) - delete receiver; - - if (input) - delete input; - - if (device) - device->drop(); - -#if USE_FREETYPE - if (use_freetype && font != NULL) - font->drop(); -#endif -} - -bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args) -{ - init_args(game_params, cmd_args); - - // List video modes if requested - if (list_video_modes) - return print_video_modes(); - - if (!init_engine(game_params.log_level)) { - errorstream << "Could not initialize game engine." << std::endl; - return false; - } - - late_init_default_settings(g_settings); - - // Speed tests (done after irrlicht is loaded to get timer) - if (cmd_args.getFlag("speedtests")) { - dstream << "Running speed tests" << std::endl; - speed_tests(); - return true; - } - - if (device->getVideoDriver() == NULL) { - errorstream << "Could not initialize video driver." << std::endl; - return false; - } - - /* - This changes the minimum allowed number of vertices in a VBO. - Default is 500. - */ - //driver->setMinHardwareBufferVertexCount(50); - - // Create time getter - g_timegetter = new IrrlichtTimeGetter(device); - - // Create game callback for menus - g_gamecallback = new MainGameCallback(device); - - device->setResizable(true); - - if (random_input) - input = new RandomInputHandler(); - else - input = new RealInputHandler(device, receiver); - - smgr = device->getSceneManager(); - - guienv = device->getGUIEnvironment(); - skin = guienv->getSkin(); - std::string font_path = g_settings->get("font_path"); - -#if USE_FREETYPE - - if (use_freetype) { - std::string fallback; - if (is_yes(gettext("needs_fallback_font"))) - fallback = "fallback_"; - u16 font_size = g_settings->getU16(fallback + "font_size"); - font_path = g_settings->get(fallback + "font_path"); - u32 font_shadow = g_settings->getU16(fallback + "font_shadow"); - u32 font_shadow_alpha = g_settings->getU16(fallback + "font_shadow_alpha"); - font = gui::CGUITTFont::createTTFont(guienv, - font_path.c_str(), font_size, true, true, - font_shadow, font_shadow_alpha); - } else { - font = guienv->getFont(font_path.c_str()); - } -#else - font = guienv->getFont(font_path.c_str()); -#endif - if (font) - skin->setFont(font); - else - errorstream << "WARNING: Font file was not found. Using default font." - << std::endl; - - font = skin->getFont(); // If font was not found, this will get us one - assert(font); - - u32 text_height = font->getDimension(L"Hello, world!").Height; - infostream << "text_height=" << text_height << std::endl; - - skin->setColor(gui::EGDC_BUTTON_TEXT, video::SColor(255, 255, 255, 255)); - skin->setColor(gui::EGDC_3D_HIGH_LIGHT, video::SColor(255, 0, 0, 0)); - skin->setColor(gui::EGDC_3D_SHADOW, video::SColor(255, 0, 0, 0)); - skin->setColor(gui::EGDC_HIGH_LIGHT, video::SColor(255, 70, 100, 50)); - skin->setColor(gui::EGDC_HIGH_LIGHT_TEXT, video::SColor(255, 255, 255, 255)); - -#if (IRRLICHT_VERSION_MAJOR >= 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR >= 2 - // Irrlicht 1.8 input colours - skin->setColor(gui::EGDC_EDITABLE, video::SColor(255, 128, 128, 128)); - skin->setColor(gui::EGDC_FOCUSED_EDITABLE, video::SColor(255, 96, 134, 49)); -#endif - - // Create the menu clouds - if (!g_menucloudsmgr) - g_menucloudsmgr = smgr->createNewSceneManager(); - if (!g_menuclouds) - g_menuclouds = new Clouds(g_menucloudsmgr->getRootSceneNode(), - g_menucloudsmgr, -1, rand(), 100); - g_menuclouds->update(v2f(0, 0), video::SColor(255, 200, 200, 255)); - scene::ICameraSceneNode* camera; - camera = g_menucloudsmgr->addCameraSceneNode(0, - v3f(0, 0, 0), v3f(0, 60, 100)); - camera->setFarValue(10000); - - /* - GUI stuff - */ - - ChatBackend chat_backend; - - // If an error occurs, this is set to something by menu(). - // It is then displayed before the menu shows on the next call to menu() - std::wstring error_message = L""; - - bool first_loop = true; - - /* - Menu-game loop - */ - bool retval = true; - bool *kill = porting::signal_handler_killstatus(); - - while (device->run() && !*kill && !g_gamecallback->shutdown_requested) - { - // Set the window caption - wchar_t *text = wgettext("Main Menu"); - device->setWindowCaption((std::wstring(L"Minetest [") + text + L"]").c_str()); - delete[] text; - - try { // This is used for catching disconnects - - guienv->clear(); - - /* - We need some kind of a root node to be able to add - custom gui elements directly on the screen. - Otherwise they won't be automatically drawn. - */ - guiroot = guienv->addStaticText(L"", core::rect(0, 0, 10000, 10000)); - - bool game_has_run = launch_game(&error_message, game_params, cmd_args); - - // If skip_main_menu, we only want to startup once - if (skip_main_menu && !first_loop) - break; - - first_loop = false; - - if (!game_has_run) { - if (skip_main_menu) - break; - else - continue; - } - - // Break out of menu-game loop to shut down cleanly - if (!device->run() || *kill) { - if (g_settings_path != "") - g_settings->updateConfigFile(g_settings_path.c_str()); - break; - } - - if (current_playername.length() > PLAYERNAME_SIZE-1) { - error_message = wgettext("Player name too long."); - playername = current_playername.substr(0, PLAYERNAME_SIZE-1); - g_settings->set("name", playername); - continue; - } - - device->getVideoDriver()->setTextureCreationFlag( - video::ETCF_CREATE_MIP_MAPS, g_settings->getBool("mip_map")); - -#ifdef HAVE_TOUCHSCREENGUI - receiver->m_touchscreengui = new TouchScreenGUI(device, receiver); - g_touchscreengui = receiver->m_touchscreengui; -#endif - the_game( - kill, - random_input, - input, - device, - font, - worldspec.path, - current_playername, - current_password, - current_address, - current_port, - error_message, - chat_backend, - gamespec, - simple_singleplayer_mode - ); - smgr->clear(); - -#ifdef HAVE_TOUCHSCREENGUI - delete g_touchscreengui; - g_touchscreengui = NULL; - receiver->m_touchscreengui = NULL; -#endif - - } //try - catch (con::PeerNotFoundException &e) { - error_message = wgettext("Connection error (timed out?)"); - errorstream << wide_to_narrow(error_message) << std::endl; - } - -#ifdef NDEBUG - catch (std::exception &e) { - std::string narrow_message = "Some exception: \""; - narrow_message += e.what(); - narrow_message += "\""; - errorstream << narrow_message << std::endl; - error_message = narrow_to_wide(narrow_message); - } -#endif - - // If no main menu, show error and exit - if (skip_main_menu) { - if (error_message != L"") { - verbosestream << "error_message = " - << wide_to_narrow(error_message) << std::endl; - retval = false; + if (!name_ok) { + if (admin_nick.empty()) { + errorstream << "No name given for admin. " + << "Please check your minetest.conf that it " + << "contains a 'name = ' to your main admin account." + << std::endl; + } else { + errorstream << "Name for admin '" + << admin_nick << "' is not valid. " + << "Please check that it only contains allowed characters. " + << "Valid characters are: " << PLAYERNAME_ALLOWED_CHARS_USER_EXPL + << std::endl; } - break; - } - } // Menu-game loop - - g_menuclouds->drop(); - g_menucloudsmgr->drop(); - - return retval; -} - -void ClientLauncher::init_args(GameParams &game_params, const Settings &cmd_args) -{ - - skip_main_menu = cmd_args.getFlag("go"); - - // FIXME: This is confusing (but correct) - - /* If world_path is set then override it unless skipping the main menu using - * the --go command line param. Else, give preference to the address - * supplied on the command line - */ - address = g_settings->get("address"); - if (game_params.world_path != "" && !skip_main_menu) - address = ""; - else if (cmd_args.exists("address")) - address = cmd_args.get("address"); - - playername = g_settings->get("name"); - if (cmd_args.exists("name")) - playername = cmd_args.get("name"); - - list_video_modes = cmd_args.getFlag("videomodes"); - - use_freetype = g_settings->getBool("freetype"); - - random_input = g_settings->getBool("random_input") - || cmd_args.getFlag("random-input"); -} - -bool ClientLauncher::init_engine(int log_level) -{ - receiver = new MyEventReceiver(); - create_engine_device(log_level); - return device != NULL; -} - -bool ClientLauncher::launch_game(std::wstring *error_message, - GameParams &game_params, const Settings &cmd_args) -{ - // Initialize menu data - MainMenuData menudata; - menudata.address = address; - menudata.name = playername; - menudata.port = itos(game_params.socket_port); - menudata.errormessage = wide_to_narrow(*error_message); - - *error_message = L""; - - if (cmd_args.exists("password")) - menudata.password = cmd_args.get("password"); - - menudata.enable_public = g_settings->getBool("server_announce"); - - // If a world was commanded, append and select it - if (game_params.world_path != "") { - worldspec.gameid = getWorldGameId(game_params.world_path, true); - worldspec.name = _("[--world parameter]"); - - if (worldspec.gameid == "") { // Create new - worldspec.gameid = g_settings->get("default_game"); - worldspec.name += " [new]"; - } - worldspec.path = game_params.world_path; - } - - /* Show the GUI menu - */ - if (!skip_main_menu) { - main_menu(&menudata); - - address = menudata.address; - int newport = stoi(menudata.port); - if (newport != 0) - game_params.socket_port = newport; - - simple_singleplayer_mode = menudata.simple_singleplayer_mode; - - std::vector worldspecs = getAvailableWorlds(); - worldspecs = getAvailableWorlds(); - - if (menudata.selected_world >= 0 - && menudata.selected_world < (int)worldspecs.size()) { - g_settings->set("selected_world_path", - worldspecs[menudata.selected_world].path); - worldspec = worldspecs[menudata.selected_world]; + return false; } - } + ChatInterface iface; + bool &kill = *porting::signal_handler_killstatus(); - if (menudata.errormessage != "") { - /* The calling function will pass this back into this function upon the - * next iteration (if any) causing it to be displayed by the GUI - */ - *error_message = narrow_to_wide(menudata.errormessage); - return false; - } + try { + // Create server + Server server(game_params.world_path, game_params.game_spec, + false, bind_addr, true, &iface); - if (menudata.name == "") - menudata.name = std::string("Guest") + itos(myrand_range(1000, 9999)); - else - playername = menudata.name; - - password = translatePassword(playername, narrow_to_wide(menudata.password)); - - g_settings->set("name", playername); - - current_playername = playername; - current_password = password; - current_address = address; - current_port = game_params.socket_port; - - // If using simple singleplayer mode, override - if (simple_singleplayer_mode) { - assert(skip_main_menu == false); - current_playername = "singleplayer"; - current_password = ""; - current_address = ""; - current_port = myrand_range(49152, 65535); - } else if (address != "") { - ServerListSpec server; - server["name"] = menudata.servername; - server["address"] = menudata.address; - server["port"] = menudata.port; - server["description"] = menudata.serverdescription; - ServerList::insert(server); - } + g_term_console.setup(&iface, &kill, admin_nick); - infostream << "Selected world: " << worldspec.name - << " [" << worldspec.path << "]" << std::endl; + g_term_console.start(); - if (current_address == "") { // If local game - if (worldspec.path == "") { - *error_message = wgettext("No world selected and no address " - "provided. Nothing to do."); - errorstream << wide_to_narrow(*error_message) << std::endl; + server.start(); + // Run server + dedicated_server_loop(server, kill); + } catch (const ModError &e) { + g_term_console.stopAndWaitforThread(); + errorstream << "ModError: " << e.what() << std::endl; return false; - } - - if (!fs::PathExists(worldspec.path)) { - *error_message = wgettext("Provided world path doesn't exist: ") - + narrow_to_wide(worldspec.path); - errorstream << wide_to_narrow(*error_message) << std::endl; - return false; - } - - // Load gamespec for required game - gamespec = findWorldSubgame(worldspec.path); - if (!gamespec.isValid() && !game_params.game_spec.isValid()) { - *error_message = wgettext("Could not find or load game \"") - + narrow_to_wide(worldspec.gameid) + L"\""; - errorstream << wide_to_narrow(*error_message) << std::endl; - return false; - } - if (game_params.game_spec.isValid() && - game_params.game_spec.id != worldspec.gameid) { - errorstream << "WARNING: Overriding gamespec from \"" - << worldspec.gameid << "\" to \"" - << game_params.game_spec.id << "\"" << std::endl; - gamespec = game_params.game_spec; - } - - if (!gamespec.isValid()) { - *error_message = wgettext("Invalid gamespec."); - *error_message += L" (world_gameid=" - + narrow_to_wide(worldspec.gameid) + L")"; - errorstream << wide_to_narrow(*error_message) << std::endl; + } catch (const ServerError &e) { + g_term_console.stopAndWaitforThread(); + errorstream << "ServerError: " << e.what() << std::endl; return false; } - } - - return true; -} -void ClientLauncher::main_menu(MainMenuData *menudata) -{ - bool *kill = porting::signal_handler_killstatus(); - video::IVideoDriver *driver = device->getVideoDriver(); - - infostream << "Waiting for other menus" << std::endl; - while (device->run() && *kill == false) { - if (noMenuActive()) - break; - driver->beginScene(true, true, video::SColor(255, 128, 128, 128)); - guienv->drawAll(); - driver->endScene(); - // On some computers framerate doesn't seem to be automatically limited - sleep_ms(25); - } - infostream << "Waited for other menus" << std::endl; + // Tell the console to stop, and wait for it to finish, + // only then leave context and free iface + g_term_console.stop(); + g_term_console.wait(); - // Cursor can be non-visible when coming from the game -#ifndef ANDROID - device->getCursorControl()->setVisible(true); -#endif - - /* show main menu */ - GUIEngine mymenu(device, guiroot, &g_menumgr, smgr, menudata, *kill); - - smgr->clear(); /* leave scene manager in a clean state */ -} - -bool ClientLauncher::create_engine_device(int log_level) -{ - static const char *driverids[] = { - "null", - "software", - "burningsvideo", - "direct3d8", - "direct3d9", - "opengl" -#ifdef _IRR_COMPILE_WITH_OGLES1_ - ,"ogles1" -#endif -#ifdef _IRR_COMPILE_WITH_OGLES2_ - ,"ogles2" -#endif - ,"invalid" - }; - - static const irr::ELOG_LEVEL irr_log_level[5] = { - ELL_NONE, - ELL_ERROR, - ELL_WARNING, - ELL_INFORMATION, -#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8) - ELL_INFORMATION + g_term_console.clearKillStatus(); + } else { #else - ELL_DEBUG + errorstream << "Cmd arg --terminal passed, but " + << "compiled without ncurses. Ignoring." << std::endl; + } { #endif - }; - - // Resolution selection - bool fullscreen = g_settings->getBool("fullscreen"); - u16 screenW = g_settings->getU16("screenW"); - u16 screenH = g_settings->getU16("screenH"); - - // bpp, fsaa, vsync - bool vsync = g_settings->getBool("vsync"); - u16 bits = g_settings->getU16("fullscreen_bpp"); - u16 fsaa = g_settings->getU16("fsaa"); - - // Determine driver - video::E_DRIVER_TYPE driverType = video::EDT_OPENGL; - - std::string driverstring = g_settings->get("video_driver"); - for (size_t i = 0; i < sizeof driverids / sizeof driverids[0]; i++) { - if (strcasecmp(driverstring.c_str(), driverids[i]) == 0) { - driverType = (video::E_DRIVER_TYPE) i; - break; - } - - if (strcasecmp("invalid", driverids[i]) == 0) { - errorstream << "WARNING: Invalid video_driver specified;" - << " defaulting to opengl" << std::endl; - break; + try { + // Create server + Server server(game_params.world_path, game_params.game_spec, false, + bind_addr, true); + server.start(); + + // Run server + bool &kill = *porting::signal_handler_killstatus(); + dedicated_server_loop(server, kill); + + } catch (const ModError &e) { + errorstream << "ModError: " << e.what() << std::endl; + return false; + } catch (const ServerError &e) { + errorstream << "ServerError: " << e.what() << std::endl; + return false; } } - SIrrlichtCreationParameters params = SIrrlichtCreationParameters(); - params.DriverType = driverType; - params.WindowSize = core::dimension2d(screenW, screenH); - params.Bits = bits; - params.AntiAlias = fsaa; - params.Fullscreen = fullscreen; - params.Stencilbuffer = false; - params.Vsync = vsync; - params.EventReceiver = receiver; - params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu"); -#ifdef __ANDROID__ - params.PrivateData = porting::app_global; - params.OGLES2ShaderPath = std::string(porting::path_user + DIR_DELIM + - "media" + DIR_DELIM + "Shaders" + DIR_DELIM).c_str(); -#endif - - device = createDeviceEx(params); - - if (device) { - // Map our log level to irrlicht engine one. - ILogger* irr_logger = device->getLogger(); - irr_logger->setLogLevel(irr_log_level[log_level]); - - porting::initIrrlicht(device); - } - - return device != NULL; + return true; } -// Misc functions - -static bool print_video_modes() +static bool migrate_map_database(const GameParams &game_params, const Settings &cmd_args) { - IrrlichtDevice *nulldevice; - - bool vsync = g_settings->getBool("vsync"); - u16 fsaa = g_settings->getU16("fsaa"); - MyEventReceiver* receiver = new MyEventReceiver(); - - SIrrlichtCreationParameters params = SIrrlichtCreationParameters(); - params.DriverType = video::EDT_NULL; - params.WindowSize = core::dimension2d(640, 480); - params.Bits = 24; - params.AntiAlias = fsaa; - params.Fullscreen = false; - params.Stencilbuffer = false; - params.Vsync = vsync; - params.EventReceiver = receiver; - params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu"); - - nulldevice = createDeviceEx(params); - - if (nulldevice == NULL) { - delete receiver; + std::string migrate_to = cmd_args.get("migrate"); + Settings world_mt; + std::string world_mt_path = game_params.world_path + DIR_DELIM + "world.mt"; + if (!world_mt.readConfigFile(world_mt_path.c_str())) { + errorstream << "Cannot read world.mt!" << std::endl; return false; } - dstream << _("Available video modes (WxHxD):") << std::endl; - - video::IVideoModeList *videomode_list = nulldevice->getVideoModeList(); - - if (videomode_list != NULL) { - s32 videomode_count = videomode_list->getVideoModeCount(); - core::dimension2d videomode_res; - s32 videomode_depth; - for (s32 i = 0; i < videomode_count; ++i) { - videomode_res = videomode_list->getVideoModeResolution(i); - videomode_depth = videomode_list->getVideoModeDepth(i); - dstream << videomode_res.Width << "x" << videomode_res.Height - << "x" << videomode_depth << std::endl; - } - - dstream << _("Active video mode (WxHxD):") << std::endl; - videomode_res = videomode_list->getDesktopResolution(); - videomode_depth = videomode_list->getDesktopDepth(); - dstream << videomode_res.Width << "x" << videomode_res.Height - << "x" << videomode_depth << std::endl; - - } - - nulldevice->drop(); - delete receiver; - - return videomode_list != NULL; -} - -#endif // !SERVER - -/***************************************************************************** - * Performance tests - *****************************************************************************/ -#ifndef SERVER -static void speed_tests() -{ - // volatile to avoid some potential compiler optimisations - volatile static s16 temp16; - volatile static f32 tempf; - static v3f tempv3f1; - static v3f tempv3f2; - static std::string tempstring; - static std::string tempstring2; - - tempv3f1 = v3f(); - tempv3f2 = v3f(); - tempstring = std::string(); - tempstring2 = std::string(); - - { - infostream << "The following test should take around 20ms." << std::endl; - TimeTaker timer("Testing std::string speed"); - const u32 jj = 10000; - for (u32 j = 0; j < jj; j++) { - tempstring = ""; - tempstring2 = ""; - const u32 ii = 10; - for (u32 i = 0; i < ii; i++) { - tempstring2 += "asd"; - } - for (u32 i = 0; i < ii+1; i++) { - tempstring += "asd"; - if (tempstring == tempstring2) - break; - } - } + if (!world_mt.exists("backend")) { + errorstream << "Please specify your current backend in world.mt:" + << std::endl + << " backend = {sqlite3|leveldb|redis|dummy|postgresql}" + << std::endl; + return false; } - infostream << "All of the following tests should take around 100ms each." - << std::endl; - - { - TimeTaker timer("Testing floating-point conversion speed"); - tempf = 0.001; - for (u32 i = 0; i < 4000000; i++) { - temp16 += tempf; - tempf += 0.001; - } + std::string backend = world_mt.get("backend"); + if (backend == migrate_to) { + errorstream << "Cannot migrate: new backend is same" + << " as the old one" << std::endl; + return false; } - { - TimeTaker timer("Testing floating-point vector speed"); + MapDatabase *old_db = ServerMap::createDatabase(backend, game_params.world_path, world_mt), + *new_db = ServerMap::createDatabase(migrate_to, game_params.world_path, world_mt); - tempv3f1 = v3f(1, 2, 3); - tempv3f2 = v3f(4, 5, 6); - for (u32 i = 0; i < 10000000; i++) { - tempf += tempv3f1.dotProduct(tempv3f2); - tempv3f2 += v3f(7, 8, 9); - } - } + u32 count = 0; + time_t last_update_time = 0; + bool &kill = *porting::signal_handler_killstatus(); - { - TimeTaker timer("Testing std::map speed"); + std::vector blocks; + old_db->listAllLoadableBlocks(blocks); + new_db->beginSave(); + for (std::vector::const_iterator it = blocks.begin(); it != blocks.end(); ++it) { + if (kill) return false; - std::map map1; - tempf = -324; - const s16 ii = 300; - for (s16 y = 0; y < ii; y++) { - for (s16 x = 0; x < ii; x++) { - map1[v2s16(x, y)] = tempf; - tempf += 1; - } + std::string data; + old_db->loadBlock(*it, &data); + if (!data.empty()) { + new_db->saveBlock(*it, data); + } else { + errorstream << "Failed to load block " << PP(*it) << ", skipping it." << std::endl; } - for (s16 y = ii - 1; y >= 0; y--) { - for (s16 x = 0; x < ii; x++) { - tempf = map1[v2s16(x, y)]; - } + if (++count % 0xFF == 0 && time(NULL) - last_update_time >= 1) { + std::cerr << " Migrated " << count << " blocks, " + << (100.0 * count / blocks.size()) << "% completed.\r"; + new_db->endSave(); + new_db->beginSave(); + last_update_time = time(NULL); } } + std::cerr << std::endl; + new_db->endSave(); + delete old_db; + delete new_db; - { - infostream << "Around 5000/ms should do well here." << std::endl; - TimeTaker timer("Testing mutex speed"); - - JMutex m; - u32 n = 0; - u32 i = 0; - do { - n += 10000; - for (; i < n; i++) { - m.Lock(); - m.Unlock(); - } - } - // Do at least 10ms - while(timer.getTimerTime() < 10); + actionstream << "Successfully migrated " << count << " blocks" << std::endl; + world_mt.set("backend", migrate_to); + if (!world_mt.updateConfigFile(world_mt_path.c_str())) + errorstream << "Failed to update world.mt!" << std::endl; + else + actionstream << "world.mt updated" << std::endl; - u32 dtime = timer.stop(); - u32 per_ms = n / dtime; - infostream << "Done. " << dtime << "ms, " << per_ms << "/ms" << std::endl; - } + return true; } -#endif