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

Use generic PlayerData objects for no-longer-connected players when rejoining a game. This fixes ticket #88 (client patch only).

Browse Source
This commit is contained in:
lotodore
2011-12-29 21:19:06 +00:00
parent ed3eb9143d
commit 64156cfa69
3 changed files with 47 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientthread.cpp
+31
View File
@@ -1044,6 +1044,37 @@ ClientThread::GetQtToolsInterface()
return *myQtToolsInterface;
}
boost::shared_ptr<PlayerData>
ClientThread::CreatePlayerData(unsigned playerId, bool isGameAdmin)
{
boost::shared_ptr<PlayerData> playerData;
PlayerInfo info;
if (GetCachedPlayerInfo(playerId, info)) {
playerData.reset(
new PlayerData(playerId, 0, info.ptype,
info.isGuest ? PLAYER_RIGHTS_GUEST : PLAYER_RIGHTS_NORMAL, isGameAdmin));
playerData->SetName(info.playerName);
if (info.hasAvatar) {
string avatarFile;
if (GetAvatarManager().GetAvatarFileName(info.avatar, avatarFile))
playerData->SetAvatarFile(GetQtToolsInterface().stringToUtf8(avatarFile));
else
RetrieveAvatarIfNeeded(playerId, info);
}
} else {
ostringstream name;
name << "#" << playerId;
// Request player info.
RequestPlayerInfo(playerId, true);
// Use temporary data until the PlayerInfo request is completed.
playerData.reset(
new PlayerData(playerId, 0, PLAYER_TYPE_HUMAN, PLAYER_RIGHTS_NORMAL, isGameAdmin));
playerData->SetName(name.str());
}
return playerData;
}
void
ClientThread::AddPlayerData(boost::shared_ptr<PlayerData> playerData)
{