Fixed 5.4.0-dev build

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 0249e155899e60b663b93fdae8253eeec8e900a2..e3a790a56a375cfa4f3e570495f36443d18895ed 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -100,13 +100,13 @@ Client::Client(
                bool ipv6,
                GameUI *game_ui
 ):
+       m_mesh_update_thread(this),
        m_tsrc(tsrc),
        m_shsrc(shsrc),
        m_itemdef(itemdef),
        m_nodedef(nodedef),
        m_sound(sound),
        m_event(event),
-       m_mesh_update_thread(this),
        m_env(
                new ClientMap(this, control, 666),
                tsrc, this

diff --git a/src/client/game.h b/src/client/game.h
index cba52e6b43395937eef158c84327796649de02a8..4023e5ea88a912c8f9f0fbc4a82c4b80559c8ba5 100644 (file)
--- a/src/client/game.h
+++ b/src/client/game.h
@@ -691,21 +691,18 @@ class Game {
        void extendedResourceCleanup();
 
        // Basic initialisation
-       bool init(const std::string &map_dir, std::string *address,
-                       u16 port,
-                       const SubgameSpec &gamespec);
+       bool init(const std::string &map_dir, const std::string &address,
+                       u16 port, const SubgameSpec &gamespec);
        bool initSound();
        bool createSingleplayerServer(const std::string &map_dir,
-                       const SubgameSpec &gamespec, u16 port, std::string *address);
+                       const SubgameSpec &gamespec, u16 port);
 
        // Client creation
-       bool createClient(const std::string &playername,
-                       const std::string &password, std::string *address, u16 port);
+       bool createClient(const GameStartData &start_data);
        bool initGui();
 
        // Client connection
-       bool connectToServer(const std::string &playername,
-                       const std::string &password, std::string *address, u16 port,
+       bool connectToServer(const GameStartData &start_data,
                        bool *connect_ok, bool *aborted);
        bool getServerContent(bool *aborted);
 
@@ -857,7 +854,8 @@ class Game {
        SoundMaker *soundmaker = nullptr;
 
        ChatBackend *chat_backend = nullptr;
-
+       LogOutputBuffer m_chat_log_buf;
+       
        EventManager *eventmgr = nullptr;
        QuicktuneShortcutter *quicktune = nullptr;
        bool registration_confirmation_shown = false;

diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp
index 7e024c899924daaa0ff8c1a70ad3028dadf2ea65..bea7d122f1488a1a0680f295b1fc8e268c8ddb25 100644 (file)
--- a/src/script/lua_api/l_item.cpp
+++ b/src/script/lua_api/l_item.cpp
@@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "common/c_content.h"
 #include "itemdef.h"
 #include "nodedef.h"
-#include "content_sao.h"
 #include "server.h"
 #include "inventory.h"
 #include "log.h"