X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fserver.h;h=9857215d09e98664772058ecfd51596b42672f91;hb=0f74c7a977c412a81890926548e2a5c8dae5f6eb;hp=5c143a6575dc7b9b6e26bc41986edc719ac0f8b1;hpb=40ad9767531beb6cf2e8bd918c9c9ed5f2749320;p=dragonfireclient.git

diff --git a/src/server.h b/src/server.h
index 5c143a657..9857215d0 100644
--- a/src/server.h
+++ b/src/server.h
@@ -219,7 +219,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 	void onMapEditEvent(const MapEditEvent &event);
 
 	// Connection must be locked when called
-	std::wstring getStatusString();
+	std::string getStatusString();
 	inline double getUptime() const { return m_uptime_counter->get(); }
 
 	// read shutdown state
@@ -495,10 +495,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 	void handleChatInterfaceEvent(ChatEvent *evt);
 
 	// This returns the answer to the sender of wmessage, or "" if there is none
-	std::wstring handleChat(const std::string &name, const std::wstring &wname,
-		std::wstring wmessage_input,
-		bool check_shout_priv = false,
-		RemotePlayer *player = NULL);
+	std::wstring handleChat(const std::string &name, std::wstring wmessage_input,
+		bool check_shout_priv = false, RemotePlayer *player = nullptr);
 	void handleAdminChat(const ChatEventChat *evt);
 
 	// When called, connection mutex should be locked
@@ -549,6 +547,10 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 	// Environment
 	ServerEnvironment *m_env = nullptr;
 
+	// Reference to the server map until ServerEnvironment is initialized
+	// after that this variable must be a nullptr
+	ServerMap *m_startup_server_map = nullptr;
+
 	// server connection
 	std::shared_ptr<con::Connection> m_con;