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

Warning: Enables debug mode.

Browse Source 
More steps towards downloading avatars from external server. This is currently BROKEN.
This commit is contained in:
lotodore
2009-03-21 01:39:00 +00:00
parent b1bad8d144
commit ebce3ee214
9 changed files with 253 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientthread.cpp
+30 -7
View File
@@ -23,6 +23,7 @@
#include <net/clientcontext.h>
#include <net/senderthread.h>
#include <net/receiverhelper.h>
#include <net/downloaderthread.h>
#include <net/clientexception.h>
#include <net/socket_msg.h>
#include <core/avatarmanager.h>
@@ -36,6 +37,8 @@
#include <memory>
#include <cassert>
#define TEMP_AVATAR_FILENAME "avatar.tmp"
using namespace std;
@@ -331,6 +334,11 @@ ClientThread::GetAvatarManager()
void
ClientThread::Main()
{
if (!GetContext().GetAvatarServerAddr().empty())
{
m_avatarDownloader.reset(new DownloaderThread);
m_avatarDownloader->Run();
}
SetState(CLIENT_INITIAL_STATE::Instance());
try
@@ -368,6 +376,12 @@ ClientThread::Main()
{
GetCallback().SignalNetClientError(e.GetErrorId(), e.GetOsErrorCode());
}
if (m_avatarDownloader)
{
m_avatarDownloader->SignalTermination();
m_avatarDownloader->Join(DOWNLOADER_THREAD_TERMINATE_TIMEOUT);
m_avatarDownloader.reset();
}
}
void
@@ -520,13 +534,22 @@ ClientThread::RetrieveAvatarIfNeeded(unsigned id, const PlayerInfo &info)
{
m_avatarHasRequestedList.push_back(id); // Never remove from this list. Only request once.
// TODO: download from avatar server if applicable.
boost::shared_ptr<NetPacket> retrieveAvatar(new NetPacketRetrieveAvatar);
NetPacketRetrieveAvatar::Data retrieveAvatarData;
retrieveAvatarData.requestId = id;
retrieveAvatarData.avatar = info.avatar;
static_cast<NetPacketRetrieveAvatar *>(retrieveAvatar.get())->SetData(retrieveAvatarData);
GetContext().GetSessionData()->GetSender().Send(GetContext().GetSessionData(), retrieveAvatar);
// Download from avatar server if applicable.
string avatarServerAddress(GetContext().GetAvatarServerAddr());
if (!avatarServerAddress.empty() && m_avatarDownloader)
{
string filename(TEMP_AVATAR_FILENAME);
m_avatarDownloader->QueueDownload(id, avatarServerAddress + filename, GetContext().GetCacheDir() + filename);
}
else
{
boost::shared_ptr<NetPacket> retrieveAvatar(new NetPacketRetrieveAvatar);
NetPacketRetrieveAvatar::Data retrieveAvatarData;
retrieveAvatarData.requestId = id;
retrieveAvatarData.avatar = info.avatar;
static_cast<NetPacketRetrieveAvatar *>(retrieveAvatar.get())->SetData(retrieveAvatarData);
GetContext().GetSessionData()->GetSender().Send(GetContext().GetSessionData(), retrieveAvatar);
}
}
}
}