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

Fixing compiler errors (some ASN.1 code was commited by accident).

Browse Source
This commit is contained in:
lotodore
2009-07-22 18:02:15 +00:00
parent cac09280a0
commit d4ae6d0e8b
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/serverlobbythread.cpp
+13 -13
View File
@@ -743,13 +743,13 @@ ServerLobbyThread::HandleNetPacketAvatarHeader(SessionWrapper session, const Net
if (headerData.avatarFileSize >= MIN_AVATAR_FILE_SIZE && headerData.avatarFileSize <= MAX_AVATAR_FILE_SIZE) if (headerData.avatarFileSize >= MIN_AVATAR_FILE_SIZE && headerData.avatarFileSize <= MAX_AVATAR_FILE_SIZE)
{ {
boost::shared_ptr<AvatarFile> tmpAvatarFile(new AvatarFile); boost::shared_ptr<AvatarData> tmpAvatarData(new AvatarData);
tmpAvatarFile->fileData.reserve(headerData.avatarFileSize); tmpAvatarData->fileData.reserve(headerData.avatarFileSize);
tmpAvatarFile->fileType = headerData.avatarFileType; tmpAvatarData->fileType = headerData.avatarFileType;
tmpAvatarFile->reportedSize = headerData.avatarFileSize; tmpAvatarData->reportedSize = headerData.avatarFileSize;
// Ignore request id for now. // Ignore request id for now.
session.playerData->SetNetAvatarFile(tmpAvatarFile); session.playerData->SetNetAvatarData(tmpAvatarData);
// Session is now receiving an avatar. // Session is now receiving an avatar.
session.sessionData->SetState(SessionData::ReceivingAvatar); session.sessionData->SetState(SessionData::ReceivingAvatar);
@@ -765,7 +765,7 @@ ServerLobbyThread::HandleNetPacketUnknownAvatar(SessionWrapper session, const Ne
if (session.playerData.get()) if (session.playerData.get())
{ {
// Free memory (just in case). // Free memory (just in case).
session.playerData->SetNetAvatarFile(boost::shared_ptr<AvatarFile>()); session.playerData->SetNetAvatarData(boost::shared_ptr<AvatarData>());
session.playerData->SetAvatarMD5(MD5Buf()); session.playerData->SetAvatarMD5(MD5Buf());
// Start session. // Start session.
EstablishSession(session); EstablishSession(session);
@@ -780,7 +780,7 @@ ServerLobbyThread::HandleNetPacketAvatarFile(SessionWrapper session, const NetPa
NetPacketAvatarFile::Data data; NetPacketAvatarFile::Data data;
tmpPacket.GetData(data); tmpPacket.GetData(data);
boost::shared_ptr<AvatarFile> tmpAvatar = session.playerData->GetNetAvatarFile(); boost::shared_ptr<AvatarData> tmpAvatar = session.playerData->GetNetAvatarData();
if (tmpAvatar.get() && tmpAvatar->fileData.size() + data.fileData.size() <= tmpAvatar->reportedSize) if (tmpAvatar.get() && tmpAvatar->fileData.size() + data.fileData.size() <= tmpAvatar->reportedSize)
{ {
std::copy(data.fileData.begin(), data.fileData.end(), back_inserter(tmpAvatar->fileData)); std::copy(data.fileData.begin(), data.fileData.end(), back_inserter(tmpAvatar->fileData));
@@ -793,7 +793,7 @@ ServerLobbyThread::HandleNetPacketAvatarEnd(SessionWrapper session, const NetPac
{ {
if (session.playerData.get()) if (session.playerData.get())
{ {
boost::shared_ptr<AvatarFile> tmpAvatar = session.playerData->GetNetAvatarFile(); boost::shared_ptr<AvatarData> tmpAvatar = session.playerData->GetNetAvatarData();
MD5Buf avatarMD5 = session.playerData->GetAvatarMD5(); MD5Buf avatarMD5 = session.playerData->GetAvatarMD5();
if (!avatarMD5.IsZero() && tmpAvatar.get()) if (!avatarMD5.IsZero() && tmpAvatar.get())
{ {
@@ -807,7 +807,7 @@ ServerLobbyThread::HandleNetPacketAvatarEnd(SessionWrapper session, const NetPac
} }
// Free memory. // Free memory.
session.playerData->SetNetAvatarFile(boost::shared_ptr<AvatarFile>()); session.playerData->SetNetAvatarData(boost::shared_ptr<AvatarData>());
// Set avatar file name. // Set avatar file name.
string avatarFileName; string avatarFileName;
if (GetAvatarManager().GetAvatarFileName(avatarMD5, avatarFileName)) if (GetAvatarManager().GetAvatarFileName(avatarMD5, avatarFileName))
@@ -994,10 +994,10 @@ 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 retrieveAvatarFile; NetPacketRetrieveAvatar::Data retrieveAvatarData;
retrieveAvatarFile.requestId = session.playerData->GetUniqueId(); retrieveAvatarData.requestId = session.playerData->GetUniqueId();
retrieveAvatarFile.avatar = session.playerData->GetAvatarMD5(); retrieveAvatarData.avatar = session.playerData->GetAvatarMD5();
static_cast<NetPacketRetrieveAvatar *>(retrieveAvatar.get())->SetData(retrieveAvatarFile); static_cast<NetPacketRetrieveAvatar *>(retrieveAvatar.get())->SetData(retrieveAvatarData);
GetSender().Send(session.sessionData, retrieveAvatar); GetSender().Send(session.sessionData, retrieveAvatar);
} }