Don't wait for avatars on game sync, instead show them whenever they are there.
This commit is contained in:
@@ -1218,9 +1218,11 @@ void mainWindowImpl::setPlayerAvatar(int myID, QString myAvatar) {
|
|||||||
|
|
||||||
if(QFile::QFile(myAvatar).exists()) {
|
if(QFile::QFile(myAvatar).exists()) {
|
||||||
playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(myAvatar);
|
playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(myAvatar);
|
||||||
|
tmpPlayer->setMyAvatar(myAvatar);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(QPixmap(myAppDataPath +"gfx/gui/table/default/genereticAvatar.png"));
|
playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(QPixmap(myAppDataPath +"gfx/gui/table/default/genereticAvatar.png"));
|
||||||
|
tmpPlayer->setMyAvatar("");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -512,6 +512,13 @@ ClientThread::CompleteTempAvatarData(unsigned playerId)
|
|||||||
|
|
||||||
// Update player info, but never re-request avatar.
|
// Update player info, but never re-request avatar.
|
||||||
SetPlayerInfo(playerId, tmpPlayerInfo, false);
|
SetPlayerInfo(playerId, tmpPlayerInfo, false);
|
||||||
|
|
||||||
|
string fileName;
|
||||||
|
if (GetAvatarManager().GetAvatarFileName(tmpPlayerInfo.avatar, fileName))
|
||||||
|
{
|
||||||
|
// Dynamically update avatar in GUI.
|
||||||
|
GetGui().setPlayerAvatar(playerId, fileName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Free memory.
|
// Free memory.
|
||||||
|
|||||||
Reference in New Issue
Block a user