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

Adding country code to protocol (currently broken).

Browse Source
This commit is contained in:
lotodore
2010-04-01 17:09:49 +00:00
parent 2dc3ab64ec
commit 652a9e55b4
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+5 -1
View File
@@ -670,7 +670,11 @@ AbstractClientStateReceiving::HandlePacket(boost::shared_ptr<ClientThread> clien
tmpInfo.playerName = STL_STRING_FROM_OCTET_STRING(netInfo->playerName);
tmpInfo.ptype = netInfo->isHuman ? PLAYER_TYPE_HUMAN : PLAYER_TYPE_COMPUTER;
tmpInfo.isGuest = netInfo->playerRights == PlayerInfoRights_playerRightsGuest;
if (netInfo->avatarData != NULL)
if (netInfo->countryCode)
{
tmpInfo.countryCode = STL_STRING_FROM_OCTET_STRING(*netInfo->countryCode);
}
if (netInfo->avatarData)
{
tmpInfo.hasAvatar = true;
memcpy(tmpInfo.avatar.GetData(), netInfo->avatarData->avatar.buf, MD5_DATA_SIZE);
src/net/common/serverlobbythread.cpp
+8 -1
View File
@@ -1205,7 +1205,7 @@ ServerLobbyThread::HandleNetPacketRetrievePlayerInfo(SessionWrapper session, con
PlayerInfoReplyMessage_t *netPlayerInfoReply = &packet->GetMsg()->choice.playerInfoReplyMessage;
netPlayerInfoReply->playerId = tmpPlayer->GetUniqueId();
if (tmpPlayer.get())
if (tmpPlayer)
{
// Send player info to client.
netPlayerInfoReply->playerInfoResult.present = playerInfoResult_PR_playerInfoData;
@@ -1217,6 +1217,13 @@ ServerLobbyThread::HandleNetPacketRetrievePlayerInfo(SessionWrapper session, con
&data->playerName,
tmpPlayer->GetName().c_str(),
tmpPlayer->GetName().length());
if (!tmpPlayer->GetCountry().empty())
{
data->countryCode = OCTET_STRING_new_fromBuf(
&asn_DEF_UTF8String,
tmpPlayer->GetCountry().c_str(),
tmpPlayer->GetCountry().length());
}
if (!tmpPlayer->GetAvatarMD5().IsZero())
{
data->avatarData = (struct PlayerInfoData::avatarData *)calloc(1, sizeof(struct PlayerInfoData::avatarData));