edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use std::vector<CFriendItem> instead of sorted_array

Browse source
This commit is contained in:
Robert Müller 2022-05-23 21:15:04 +02:00 committed by heinrich5991
parent de23bf912d
commit b24f318450
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/client/components/menus.h
View file

@ -466,7 +466,7 @@ protected:
} }
}; };
sorted_array<CFriendItem> m_lFriends; std::vector<CFriendItem> m_lFriends;
int m_FriendlistSelectedIndex; int m_FriendlistSelectedIndex;
void FriendlistOnUpdate(); void FriendlistOnUpdate();

34
src/game/client/components/menus_browser.cpp
View file

@ -221,8 +221,8 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
m_SelectedIndex = -1; m_SelectedIndex = -1;
// reset friend counter // reset friend counter
for(int i = 0; i < m_lFriends.size(); m_lFriends[i++].m_NumFound = 0) for(auto &Friend : m_lFriends)
; Friend.m_NumFound = 0;
auto RenderBrowserIcons = [this](CUIElement::SUIElementRect &UIRect, CUIRect *pRect, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor, const char *pText, ETextAlignment TextAlign, bool SmallFont = false) { auto RenderBrowserIcons = [this](CUIElement::SUIElementRect &UIRect, CUIRect *pRect, const ColorRGBA &TextColor, const ColorRGBA &TextOutlineColor, const char *pText, ETextAlignment TextAlign, bool SmallFont = false) {
float FontSize = 14.0f * UI()->Scale(); float FontSize = 14.0f * UI()->Scale();
@ -269,13 +269,13 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
{ {
unsigned NameHash = str_quickhash(pItem->m_aClients[j].m_aName); unsigned NameHash = str_quickhash(pItem->m_aClients[j].m_aName);
unsigned ClanHash = str_quickhash(pItem->m_aClients[j].m_aClan); unsigned ClanHash = str_quickhash(pItem->m_aClients[j].m_aClan);
for(int f = 0; f < m_lFriends.size(); ++f) for(auto &Friend : m_lFriends)
{ {
if(((g_Config.m_ClFriendsIgnoreClan && m_lFriends[f].m_pFriendInfo->m_aName[0]) || (ClanHash == m_lFriends[f].m_pFriendInfo->m_ClanHash && !str_comp(m_lFriends[f].m_pFriendInfo->m_aClan, pItem->m_aClients[j].m_aClan))) && if(((g_Config.m_ClFriendsIgnoreClan && Friend.m_pFriendInfo->m_aName[0]) || (ClanHash == Friend.m_pFriendInfo->m_ClanHash && !str_comp(Friend.m_pFriendInfo->m_aClan, pItem->m_aClients[j].m_aClan))) &&
(!m_lFriends[f].m_pFriendInfo->m_aName[0] || (NameHash == m_lFriends[f].m_pFriendInfo->m_NameHash && !str_comp(m_lFriends[f].m_pFriendInfo->m_aName, pItem->m_aClients[j].m_aName)))) (!Friend.m_pFriendInfo->m_aName[0] || (NameHash == Friend.m_pFriendInfo->m_NameHash && !str_comp(Friend.m_pFriendInfo->m_aName, pItem->m_aClients[j].m_aName))))
{ {
m_lFriends[f].m_NumFound++; Friend.m_NumFound++;
if(m_lFriends[f].m_pFriendInfo->m_aName[0]) if(Friend.m_pFriendInfo->m_aName[0])
break; break;
} }
} }
@ -1254,9 +1254,9 @@ void CMenus::FriendlistOnUpdate()
CFriendItem Item; CFriendItem Item;
Item.m_pFriendInfo = m_pClient->Friends()->GetFriend(i); Item.m_pFriendInfo = m_pClient->Friends()->GetFriend(i);
Item.m_NumFound = 0; Item.m_NumFound = 0;
m_lFriends.add_unsorted(Item); m_lFriends.push_back(Item);
} }
m_lFriends.sort_range(); std::sort(m_lFriends.begin(), m_lFriends.end());
} }
void CMenus::RenderServerbrowserFriends(CUIRect View) void CMenus::RenderServerbrowserFriends(CUIRect View)
@ -1286,14 +1286,14 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
// friends list(remove friend) // friends list(remove friend)
static float s_ScrollValue = 0; static float s_ScrollValue = 0;
if(m_FriendlistSelectedIndex >= m_lFriends.size()) if(m_FriendlistSelectedIndex >= (int)m_lFriends.size())
m_FriendlistSelectedIndex = m_lFriends.size() - 1; m_FriendlistSelectedIndex = m_lFriends.size() - 1;
UiDoListboxStart(&m_lFriends, &List, 30.0f, "", "", m_lFriends.size(), 1, m_FriendlistSelectedIndex, s_ScrollValue); UiDoListboxStart(&m_lFriends, &List, 30.0f, "", "", m_lFriends.size(), 1, m_FriendlistSelectedIndex, s_ScrollValue);
m_lFriends.sort_range(); std::sort(m_lFriends.begin(), m_lFriends.end());
for(int i = 0; i < m_lFriends.size(); ++i) for(auto &Friend : m_lFriends)
{ {
CListboxItem Item = UiDoListboxNextItem(&m_lFriends[i], false, false); CListboxItem Item = UiDoListboxNextItem(&Friend.m_NumFound, false, false);
if(Item.m_Visible) if(Item.m_Visible)
{ {
@ -1304,14 +1304,14 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
Item.m_Rect.VMargin(2.5f, &Item.m_Rect); Item.m_Rect.VMargin(2.5f, &Item.m_Rect);
Item.m_Rect.HSplitTop(12.0f, &Item.m_Rect, &Button); Item.m_Rect.HSplitTop(12.0f, &Item.m_Rect, &Button);
UI()->DoLabelScaled(&Item.m_Rect, m_lFriends[i].m_pFriendInfo->m_aName, FontSize, TEXTALIGN_LEFT); UI()->DoLabelScaled(&Item.m_Rect, Friend.m_pFriendInfo->m_aName, FontSize, TEXTALIGN_LEFT);
UI()->DoLabelScaled(&Button, m_lFriends[i].m_pFriendInfo->m_aClan, FontSize, TEXTALIGN_LEFT); UI()->DoLabelScaled(&Button, Friend.m_pFriendInfo->m_aClan, FontSize, TEXTALIGN_LEFT);
RenderTools()->DrawUIRect(&OnState, m_lFriends[i].m_NumFound ? ColorRGBA(0.0f, 1.0f, 0.0f, 0.25f) : ColorRGBA(1.0f, 0.0f, 0.0f, 0.25f), CUI::CORNER_R, 4.0f); RenderTools()->DrawUIRect(&OnState, Friend.m_NumFound ? ColorRGBA(0.0f, 1.0f, 0.0f, 0.25f) : ColorRGBA(1.0f, 0.0f, 0.0f, 0.25f), CUI::CORNER_R, 4.0f);
OnState.HMargin((OnState.h - FontSize) / 3, &OnState); OnState.HMargin((OnState.h - FontSize) / 3, &OnState);
OnState.VMargin(5.0f, &OnState); OnState.VMargin(5.0f, &OnState);
char aBuf[64]; char aBuf[64];
str_format(aBuf, sizeof(aBuf), "%i", m_lFriends[i].m_NumFound); str_format(aBuf, sizeof(aBuf), "%i", Friend.m_NumFound);
UI()->DoLabelScaled(&OnState, aBuf, FontSize + 2, TEXTALIGN_RIGHT); UI()->DoLabelScaled(&OnState, aBuf, FontSize + 2, TEXTALIGN_RIGHT);
} }
} }