Merge pull request #7316 from dobrykafe/pr-server-info-colors

server info: show clanmates in different color
This commit is contained in:
Robert Müller 2023-10-07 15:41:47 +00:00 committed by GitHub
commit a91374b276
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1085,9 +1085,25 @@ void CMenus::RenderServerbrowserInfoScoreboard(CUIRect View, const CServerInfo *
CUIRect Skin, Name, Clan, Score, Flag;
Name = Item.m_Rect;
ColorRGBA Color = CurrentClient.m_FriendState == IFriends::FRIEND_NO ?
ColorRGBA(1.0f, 1.0f, 1.0f, (i % 2 + 1) * 0.05f) :
ColorRGBA(0.5f, 1.0f, 0.5f, 0.15f + (i % 2 + 1) * 0.05f);
ColorRGBA Color;
const float Alpha = (i % 2 + 1) * 0.05f;
switch(CurrentClient.m_FriendState)
{
case IFriends::FRIEND_NO:
Color = ColorRGBA(1.0f, 1.0f, 1.0f, Alpha);
break;
case IFriends::FRIEND_PLAYER:
Color = ColorRGBA(0.5f, 1.0f, 0.5f, 0.15f + Alpha);
break;
case IFriends::FRIEND_CLAN:
Color = ColorRGBA(0.4f, 0.4f, 1.0f, 0.15f + Alpha);
break;
default:
dbg_assert(false, "Invalid friend state");
dbg_break();
break;
}
Name.Draw(Color, IGraphics::CORNER_ALL, 4.0f);
Name.VSplitLeft(1.0f, nullptr, &Name);
Name.VSplitLeft(34.0f, &Score, &Name);