Skip to content

Change leader vector to std::vector #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Vauff merged 1 commit into from
Nov 5, 2025
Merged

Change leader vector to std::vector #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/leader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ std::map<std::string, ColorPreset> mapColorPresets = {
};
// clang-format on

CUtlVector<ZEPlayerHandle> g_vecLeaders;
std::vector<ZEPlayerHandle> g_vecLeaders;

static int g_iMarkerCount = 0;
static bool g_bPingWithLeader = true;
Expand Down Expand Up @@ -110,14 +110,16 @@ static std::pair<int, std::string> GetLeaders()
{
int iLeaders = 0;
std::string strLeaders = "";
FOR_EACH_VEC_BACK(g_vecLeaders, i)

for (int i = g_vecLeaders.size() - 1; i >= 0; i--)
{
ZEPlayer* pLeader = g_vecLeaders[i].Get();
if (!pLeader)
{
g_vecLeaders.Remove(i);
g_vecLeaders.erase(g_vecLeaders.begin() + i);
continue;
}

CCSPlayerController* pController = CCSPlayerController::FromSlot((CPlayerSlot)pLeader->GetPlayerSlot());
if (!pController)
continue;
Expand Down Expand Up @@ -224,7 +226,7 @@ static bool Leader_SetNewLeader(ZEPlayer* zpLeader, std::string strColor = "")
Leader_ApplyLeaderVisuals(pawnLeader);

zpLeader->PurgeLeaderVotes();
g_vecLeaders.AddToTail(zpLeader->GetHandle());
g_vecLeaders.push_back(zpLeader->GetHandle());
return true;
}

Expand Down Expand Up @@ -299,11 +301,12 @@ static void RemoveLeader(CCSPlayerController* ccsLeader)
zpLeader->SetTracerColor(Color(0, 0, 0, 0));
zpLeader->SetBeaconColor(Color(0, 0, 0, 0));
zpLeader->SetGlowColor(Color(0, 0, 0, 0));
FOR_EACH_VEC_BACK(g_vecLeaders, i)

for (int i = g_vecLeaders.size() - 1; i >= 0; i--)
{
if (g_vecLeaders[i] == zpLeader)
{
g_vecLeaders.Remove(i);
g_vecLeaders.erase(g_vecLeaders.begin() + i);
break;
}
}
Expand Down Expand Up @@ -367,7 +370,8 @@ void Leader_PostEventAbstract_Source1LegacyGameEvent(const uint64* clients, cons
return;

bool bNoHumanLeaders = true;
FOR_EACH_VEC_BACK(g_vecLeaders, i)

for (int i = 0; i < g_vecLeaders.size(); i++)
{
if (g_vecLeaders[i].IsValid())
{
Expand Down
2 changes: 1 addition & 1 deletion src/leader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "playermanager.h"
#include "utils/entity.h"

extern CUtlVector<ZEPlayerHandle> g_vecLeaders;
extern std::vector<ZEPlayerHandle> g_vecLeaders;
extern CConVar<bool> g_cvarEnableLeader;
extern CConVar<bool> g_cvarLeaderActionsHumanOnly;
extern CConVar<CUtlString> g_cvarMarkParticlePath;
Expand Down