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

Use std::vector<CGhostItem> instead of sorted_array

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

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

@ -3,7 +3,6 @@
#ifndef GAME_CLIENT_COMPONENTS_MENUS_H
#define GAME_CLIENT_COMPONENTS_MENUS_H
#include <base/tl/sorted_array.h>
#include <base/vmath.h>
#include <chrono>
@ -642,7 +641,7 @@ public:
bool HasFile() const { return m_aFilename[0]; }
};
sorted_array<CGhostItem> m_lGhosts;
std::vector<CGhostItem> m_lGhosts;
std::chrono::nanoseconds m_GhostPopulateStartTime{0};

29
src/game/client/components/menus_ingame.cpp
View file

@ -918,7 +918,7 @@ int CMenus::GhostlistFetchCallback(const char *pName, int IsDir, int StorageType
str_copy(Item.m_aPlayer, Info.m_aOwner, sizeof(Item.m_aPlayer));
Item.m_Time = Info.m_Time;
if(Item.m_Time > 0)
pSelf->m_lGhosts.add(Item);
pSelf->m_lGhosts.push_back(Item);
if(tw::time_get() - pSelf->m_GhostPopulateStartTime > 500ms)
{
@ -930,16 +930,15 @@ int CMenus::GhostlistFetchCallback(const char *pName, int IsDir, int StorageType
void CMenus::GhostlistPopulate()
{
CGhostItem *pOwnGhost = 0;
m_lGhosts.clear();
m_GhostPopulateStartTime = tw::time_get();
Storage()->ListDirectory(IStorage::TYPE_ALL, m_pClient->m_Ghost.GetGhostDir(), GhostlistFetchCallback, this);
std::sort(m_lGhosts.begin(), m_lGhosts.end());
for(int i = 0; i < m_lGhosts.size(); i++)
{
if(str_comp(m_lGhosts[i].m_aPlayer, Client()->PlayerName()) == 0 && (!pOwnGhost || m_lGhosts[i] < *pOwnGhost))
pOwnGhost = &m_lGhosts[i];
}
CGhostItem *pOwnGhost = 0;
for(auto &Ghost : m_lGhosts)
if(str_comp(Ghost.m_aPlayer, Client()->PlayerName()) == 0 && (!pOwnGhost || Ghost < *pOwnGhost))
pOwnGhost = &Ghost;
if(pOwnGhost)
{
@ -950,16 +949,16 @@ void CMenus::GhostlistPopulate()
CMenus::CGhostItem *CMenus::GetOwnGhost()
{
for(int i = 0; i < m_lGhosts.size(); i++)
if(m_lGhosts[i].m_Own)
return &m_lGhosts[i];
return 0;
for(auto &Ghost : m_lGhosts)
if(Ghost.m_Own)
return &Ghost;
return nullptr;
}
void CMenus::UpdateOwnGhost(CGhostItem Item)
{
int Own = -1;
for(int i = 0; i < m_lGhosts.size(); i++)
for(size_t i = 0; i < m_lGhosts.size(); i++)
if(m_lGhosts[i].m_Own)
Own = i;
@ -972,14 +971,14 @@ void CMenus::UpdateOwnGhost(CGhostItem Item)
}
Item.m_Own = true;
m_lGhosts.add(Item);
m_lGhosts.insert(std::lower_bound(m_lGhosts.begin(), m_lGhosts.end(), Item), Item);
}
void CMenus::DeleteGhostItem(int Index)
{
if(m_lGhosts[Index].HasFile())
Storage()->RemoveFile(m_lGhosts[Index].m_aFilename, IStorage::TYPE_SAVE);
m_lGhosts.remove_index(Index);
m_lGhosts.erase(m_lGhosts.begin() + Index);
}
void CMenus::RenderGhost(CUIRect MainView)
@ -1158,7 +1157,7 @@ void CMenus::RenderGhost(CUIRect MainView)
GhostlistPopulate();
}
if(s_SelectedIndex == -1 || s_SelectedIndex >= m_lGhosts.size())
if(s_SelectedIndex == -1 || s_SelectedIndex >= (int)m_lGhosts.size())
return;
CGhostItem *pGhost = &m_lGhosts[s_SelectedIndex];