Fix formspec list spacing (#10861)

[dragonfireclient.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 82666e463c644e40ea661a0525f83ebf42e9edf6..f7238176b1e858905cedd0cdc036e140ea217470 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) && \
@@ -197,7 +205,7 @@ int main(int argc, char *argv[])
        }
 #endif
 
-       GameParams game_params;
+       GameStartData game_params;
 #ifdef SERVER
        porting::attachOrCreateConsole();
        game_params.is_dedicated_server = true;
@@ -350,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;
 }
@@ -604,10 +617,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;
@@ -781,7 +798,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;
@@ -806,7 +823,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;
        }
@@ -887,7 +904,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);
 
@@ -922,7 +938,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