sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use player id as request id for avatar requests by the server.

Browse Source
This commit is contained in:
lotodore
2007-10-08 18:49:13 +00:00
parent 24ae6a66ed
commit dc8f9e0c73
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/serverlobbythread.cpp
+2 -2
View File
@@ -57,7 +57,7 @@ private:
ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ConfigFile *playerConfig, AvatarManager &avatarManager) ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ConfigFile *playerConfig, AvatarManager &avatarManager)
: m_gui(gui), m_avatarManager(avatarManager), m_playerConfig(playerConfig), : 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_senderCallback.reset(new ServerSenderCallback(*this));
m_sender.reset(new SenderThread(GetSenderCallback())); m_sender.reset(new SenderThread(GetSenderCallback()));
@@ -578,7 +578,7 @@ ServerLobbyThread::RequestPlayerAvatar(SessionWrapper session)
// Ask the client to send its avatar. // Ask the client to send its avatar.
boost::shared_ptr<NetPacket> retrieveAvatar(new NetPacketRetrieveAvatar); boost::shared_ptr<NetPacket> retrieveAvatar(new NetPacketRetrieveAvatar);
NetPacketRetrieveAvatar::Data retrieveAvatarData; NetPacketRetrieveAvatar::Data retrieveAvatarData;
retrieveAvatarData.requestId = m_curRequestId++; retrieveAvatarData.requestId = session.playerData->GetUniqueId();
retrieveAvatarData.avatar = session.playerData->GetAvatarMD5(); retrieveAvatarData.avatar = session.playerData->GetAvatarMD5();
static_cast<NetPacketRetrieveAvatar *>(retrieveAvatar.get())->SetData(retrieveAvatarData); static_cast<NetPacketRetrieveAvatar *>(retrieveAvatar.get())->SetData(retrieveAvatarData);
GetSender().Send(session.sessionData->GetSocket(), retrieveAvatar); GetSender().Send(session.sessionData->GetSocket(), retrieveAvatar);
src/net/serverlobbythread.h
-2
View File
@@ -165,8 +165,6 @@ private:
u_int32_t m_curUniquePlayerId; u_int32_t m_curUniquePlayerId;
mutable boost::mutex m_curUniquePlayerIdMutex; mutable boost::mutex m_curUniquePlayerIdMutex;
u_int32_t m_curRequestId;
}; };
#endif #endif