Added callback to display player names of connected players.

src/net/common/netpacket.cpp

@@ -25,7 +25,7 @@
 
 using namespace std;
 
-#define ADD_PADDING(x) ((((x) + 3) >> 2) << 2)
+#define ADD_PADDING(x) ((((x) + 3) >> 2) << 2)
 
 #define NET_TYPE_JOIN_GAME					1
 #define NET_TYPE_JOIN_GAME_ACK				2

src/net/common/serverrecvstate.cpp

@@ -77,7 +77,9 @@ ServerRecvStateInit::Process(ServerRecvThread &server)
 				if (tmpPacket)
 				{
 					// TODO: check password
-					// TODO: display name
+					NetPacketJoinGame::Data playerData;
+					tmpPacket->GetData(playerData);
+					server.GetCallback().SignalNetServerPlayerJoined(playerData.playerName);
 					boost::shared_ptr<NetPacket> answer(new NetPacketJoinGameAck);
 					server.GetSender().Send(answer, recvSock);
 					session->SetState(SessionData::Established);

src/net/common/serverrecvthread.cpp

@@ -41,7 +41,8 @@ private:
 };
 
 
-ServerRecvThread::ServerRecvThread()
+ServerRecvThread::ServerRecvThread(ServerCallback &cb)
+: m_callback(cb)
 {
 	m_senderCallback.reset(new ServerSenderCallback(*this));
 	m_sender.reset(new SenderThread(GetSenderCallback()));
@@ -85,6 +86,12 @@ ServerRecvThread::AddNotification(unsigned notification)
 	m_notificationQueue.push_back(notification);
 }
 
+ServerCallback &
+ServerRecvThread::GetCallback()
+{
+	return m_callback;
+}
+
 void
 ServerRecvThread::Main()
 {

src/net/common/serverthread.cpp

@@ -33,7 +33,7 @@ ServerThread::ServerThread(ServerCallback &cb)
 : m_callback(cb)
 {
 	m_context.reset(new ServerContext);
-	m_recvThread.reset(new ServerRecvThread);
+	m_recvThread.reset(new ServerRecvThread(cb));
 }
 
 ServerThread::~ServerThread()