From dc8f9e0c73de14cc3bc66d467112c5e25deceaf5 Mon Sep 17 00:00:00 2001 From: lotodore Date: Mon, 8 Oct 2007 18:49:13 +0000 Subject: [PATCH] Use player id as request id for avatar requests by the server. --- src/net/common/serverlobbythread.cpp | 4 ++-- src/net/serverlobbythread.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index 66da09c1..6ea37800 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -57,7 +57,7 @@ private: ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ConfigFile *playerConfig, AvatarManager &avatarManager) : m_gui(gui), m_avatarManager(avatarManager), m_playerConfig(playerConfig), - m_curGameId(0), m_curUniquePlayerId(0), m_curRequestId(0) + m_curGameId(0), m_curUniquePlayerId(0) { m_senderCallback.reset(new ServerSenderCallback(*this)); m_sender.reset(new SenderThread(GetSenderCallback())); @@ -578,7 +578,7 @@ ServerLobbyThread::RequestPlayerAvatar(SessionWrapper session) // Ask the client to send its avatar. boost::shared_ptr retrieveAvatar(new NetPacketRetrieveAvatar); NetPacketRetrieveAvatar::Data retrieveAvatarData; - retrieveAvatarData.requestId = m_curRequestId++; + retrieveAvatarData.requestId = session.playerData->GetUniqueId(); retrieveAvatarData.avatar = session.playerData->GetAvatarMD5(); static_cast(retrieveAvatar.get())->SetData(retrieveAvatarData); GetSender().Send(session.sessionData->GetSocket(), retrieveAvatar); diff --git a/src/net/serverlobbythread.h b/src/net/serverlobbythread.h index cb9b612b..d753bb43 100644 --- a/src/net/serverlobbythread.h +++ b/src/net/serverlobbythread.h @@ -165,8 +165,6 @@ private: u_int32_t m_curUniquePlayerId; mutable boost::mutex m_curUniquePlayerIdMutex; - - u_int32_t m_curRequestId; }; #endif