GUIScene: Clear depth buffer + replace deprecated clearZBuffer calls

[minetest.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 1993f7c248f9be3af6bcfed4acc9b7f499d86abf..39b441d2c4b1d0879f6d1cf4abacd6852dd50a06 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -47,11 +47,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gui/guiEngine.h"
 #include "gui/mainmenumanager.h"
 #endif
-
 #ifdef HAVE_TOUCHSCREENGUI
        #include "gui/touchscreengui.h"
 #endif
 
+// for version information only
+extern "C" {
+#if USE_LUAJIT
+       #include <luajit.h>
+#else
+       #include <lua.h>
+#endif
+}
+
 #if !defined(SERVER) && \
        (IRRLICHT_VERSION_MAJOR == 1) && \
        (IRRLICHT_VERSION_MINOR == 8) && \
@@ -187,11 +195,17 @@ int main(int argc, char *argv[])
 #ifndef __ANDROID__
        // Run unit 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
 
-       GameParams game_params;
+       GameStartData game_params;
 #ifdef SERVER
        porting::attachOrCreateConsole();
        game_params.is_dedicated_server = true;
@@ -207,9 +221,6 @@ int main(int argc, char *argv[])
 
        sanity_check(!game_params.world_path.empty());
 
-       infostream << "Using commanded world path ["
-                  << game_params.world_path << "]" << std::endl;
-
        if (game_params.is_dedicated_server)
                return run_dedicated_server(game_params, cmd_args) ? 0 : 1;
 
@@ -347,6 +358,11 @@ static void print_version()
                << " (" << 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
+       std::cout << "Using " << LUA_RELEASE << std::endl;
 #endif
        std::cout << g_build_info << std::endl;
 }
@@ -460,7 +476,6 @@ static bool create_userdata_path()
        } else {
                success = true;
        }
-       porting::copyAssets();
 #else
        // Create user data directory
        success = fs::CreateDir(porting::path_user);
@@ -472,12 +487,15 @@ static bool create_userdata_path()
 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;
 
@@ -602,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;
@@ -686,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<WorldSpec> worldspecs = getAvailableWorlds();
        std::string world_path;
 
@@ -708,7 +728,7 @@ static bool auto_select_world(GameParams *game_params)
                // 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;
        }
 
@@ -770,7 +790,6 @@ static bool determine_subgame(GameParams *game_params)
 
        assert(game_params->world_path != "");  // Pre-condition
 
-       verbosestream << _("Determining gameid/gamespec") << std::endl;
        // If world doesn't exist
        if (!game_params->world_path.empty()
                && !getWorldExists(game_params->world_path)) {
@@ -782,7 +801,7 @@ static bool determine_subgame(GameParams *game_params)
                        gamespec = findSubgame(g_settings->get("default_game"));
                        infostream << "Using default gameid [" << gamespec.id << "]" << std::endl;
                        if (!gamespec.isValid()) {
-                               errorstream << "Subgame specified in default_game ["
+                               errorstream << "Game specified in default_game ["
                                            << g_settings->get("default_game")
                                            << "] is invalid." << std::endl;
                                return false;
@@ -807,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;
        }
@@ -888,7 +907,6 @@ 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);
 
@@ -923,7 +941,6 @@ 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