1 files changed, 47 insertions, 16 deletions

diff --git a/source/Server.h b/source/Server.h
index dd7a08735..6f8576ece 100644
--- a/source/Server.h
+++ b/source/Server.h
@@ -37,11 +37,16 @@ class cServer										// tolua_export
 public:												// tolua_export
 	bool InitServer(cIniFile & a_SettingsIni);
 
-	bool IsConnected(void) const { return m_bIsConnected;} // returns connection status
+	// tolua_begin
 	
-	void BroadcastChat(const AString & a_Message, const cClientHandle * a_Exclude = NULL);  // tolua_export
+	const AString & GetDescription(void) const {return m_Description; }
 
-	bool Tick(float a_Dt);
+	// Player counts:
+	int  GetMaxPlayers(void) const {return m_MaxPlayers; }
+	int  GetNumPlayers(void) const { return m_NumPlayers; }
+	void SetMaxPlayers(int a_MaxPlayers) { m_MaxPlayers = a_MaxPlayers; }
+	
+	// tolua_end
 
 	bool Start(void);
 
@@ -53,14 +58,12 @@ public:												// tolua_export
 	/// Binds the built-in console commands with the plugin manager
 	static void BindBuiltInConsoleCommands(void);
 	
-	void Shutdown();
+	void Shutdown(void);
 
-	void SendMessage(const AString & a_Message, cPlayer * a_Player = NULL, bool a_bExclude = false );  // tolua_export
-	
 	void KickUser(int a_ClientID, const AString & a_Reason);
 	void AuthenticateUser(int a_ClientID);  // Called by cAuthenticator to auth the specified user
 
-	const AString & GetServerID(void) const; // tolua_export
+	const AString & GetServerID(void) const { return m_ServerID; }  // tolua_export
 	
 	void ClientDestroying(const cClientHandle * a_Client);  // Called by cClientHandle::Destroy(); stop m_SocketThreads from calling back into a_Client
 	
@@ -72,6 +75,9 @@ public:												// tolua_export
 	
 	void RemoveClient(const cClientHandle * a_Client);  // Removes the clienthandle from m_SocketThreads
 	
+	/// Don't tick a_Client anymore, it will be ticked from its cPlayer instead
+	void ClientMovedToWorld(const cClientHandle * a_Client);
+	
 	CryptoPP::RSA::PrivateKey & GetPrivateKey(void) { return m_PrivateKey; }
 	CryptoPP::RSA::PublicKey  & GetPublicKey (void) { return m_PublicKey; }
 	
@@ -103,25 +109,36 @@ private:
 		void NotifyClientWrite(const cClientHandle * a_Client);
 	} ;
 	
-	struct sServerState;
-	sServerState * m_pState;
+	/// The server tick thread takes care of the players who aren't yet spawned in a world
+	class cTickThread :
+		public cIsThread
+	{
+		typedef cIsThread super;
+		
+	public:
+		cTickThread(cServer & a_Server);
+		
+	protected:
+		cServer & m_Server;
+		
+		// cIsThread overrides:
+		virtual void Execute(void) override;
+	} ;
+	
 	
 	cNotifyWriteThread m_NotifyWriteThread;
 	
 	cListenThread m_ListenThreadIPv4;
 	cListenThread m_ListenThreadIPv6;
 	
-	cCriticalSection  m_CSClients;  // Locks client list
-	cClientHandleList m_Clients;    // Clients that are connected to the server
+	cCriticalSection  m_CSClients;        ///< Locks client lists
+	cClientHandleList m_Clients;          ///< Clients that are connected to the server and not yet assigned to a cWorld
+	cClientHandleList m_ClientsToRemove;  ///< Clients that have just been moved into a world and are to be removed from m_Clients in the next Tick()
 	
 	cSocketThreads m_SocketThreads;
 	
 	int m_ClientViewDistance;  // The default view distance for clients; settable in Settings.ini
 
-	// Time since server was started
-	float m_Millisecondsf;
-	unsigned int m_Milliseconds;
-
 	bool m_bIsConnected; // true - connected false - not connected
 
 	bool m_bRestarting;
@@ -131,13 +148,27 @@ private:
 	
 	cRCONServer m_RCONServer;
 	
+	AString m_Description;
+	int m_MaxPlayers;
+	int m_NumPlayers;
+	
+	cTickThread m_TickThread;
+	cEvent m_RestartEvent;
+	
+	/// The server ID used for client authentication
+	AString m_ServerID;
+	
 
 	cServer(void);
-	~cServer();
 
 	/// Loads, or generates, if missing, RSA keys for protocol encryption
 	void PrepareKeys(void);
 	
+	bool Tick(float a_Dt);
+	
+	/// Ticks the clients in m_Clients, manages the list in respect to removing clients
+	void TickClients(float a_Dt);
+
 	// cListenThread::cCallback overrides:
 	virtual void OnConnectionAccepted(cSocket & a_Socket) override;
 }; // tolua_export