From 83f59484d3b03e8964f1c7886dd1a0afd96ddd8d Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Sat, 18 Jul 2020 14:16:47 +0200
Subject: Fixed 5.4.0-dev build

---
 src/client/client.cpp |  2 +-
 src/client/game.h     | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/client')

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 0249e1558..e3a790a56 100644
--- 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 cba52e6b4..4023e5ea8 100644
--- a/src/client/game.h
+++ b/src/client/game.h
@@ -691,21 +691,18 @@ public:
 	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 @@ public:
 	SoundMaker *soundmaker = nullptr;
 
 	ChatBackend *chat_backend = nullptr;
-
+	LogOutputBuffer m_chat_log_buf;
+	
 	EventManager *eventmgr = nullptr;
 	QuicktuneShortcutter *quicktune = nullptr;
 	bool registration_confirmation_shown = false;
-- 
cgit v1.2.3