From 430eb1efbad06b55d29da752583b8c1088a5ba02 Mon Sep 17 00:00:00 2001 From: notkoen <45914779+notkoen@users.noreply.github.com> Date: Fri, 7 Nov 2025 15:34:39 -0800 Subject: [PATCH 1/2] Convert adminsystem vector to std::vector --- src/adminsystem.cpp | 18 +++++++++--------- src/adminsystem.h | 3 +-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/adminsystem.cpp b/src/adminsystem.cpp index acc950504..ffb87dcc8 100644 --- a/src/adminsystem.cpp +++ b/src/adminsystem.cpp @@ -1531,7 +1531,7 @@ void CAdminSystem::AddOrUpdateAdmin(uint64 iSteamID, uint64 iFlags, int iAdminIm bool CAdminSystem::LoadInfractions() { - m_vecInfractions.PurgeAndDeleteElements(); + m_vecInfractions.clear(); KeyValues* pKV = new KeyValues("infractions"); KeyValues::AutoDelete autoDelete(pKV); @@ -1592,7 +1592,7 @@ void CAdminSystem::SaveInfractions() KeyValues* pSubKey; KeyValues::AutoDelete autoDelete(pKV); - FOR_EACH_VEC(m_vecInfractions, i) + for (int i = 0; i < m_vecInfractions.size(); i++) { time_t timestamp = m_vecInfractions[i]->GetTimestamp(); if (timestamp != 0 && timestamp < std::time(0)) @@ -1620,7 +1620,7 @@ void CAdminSystem::SaveInfractions() void CAdminSystem::AddInfraction(CInfractionBase* infraction) { - m_vecInfractions.AddToTail(infraction); + m_vecInfractions.push_back(infraction); } // This function can run at least twice when a player connects: Immediately upon client connection, and also upon getting authenticated by steam. @@ -1628,7 +1628,7 @@ void CAdminSystem::AddInfraction(CInfractionBase* infraction) // This returns false only when called from ClientConnect and the player is banned in order to reject them. bool CAdminSystem::ApplyInfractions(ZEPlayer* player) { - FOR_EACH_VEC(m_vecInfractions, i) + for (int i = m_vecInfractions.size() - 1; i >= 0; i--) { // Because this can run without the player being authenticated, and the fact that we're applying a ban/mute here, // we can immediately just use the steamid we got from the connecting player. @@ -1644,7 +1644,7 @@ bool CAdminSystem::ApplyInfractions(ZEPlayer* player) time_t timestamp = m_vecInfractions[i]->GetTimestamp(); if (timestamp != 0 && timestamp <= std::time(0)) { - m_vecInfractions.Remove(i); + m_vecInfractions.erase(m_vecInfractions.begin() + i); continue; } @@ -1660,12 +1660,12 @@ bool CAdminSystem::ApplyInfractions(ZEPlayer* player) bool CAdminSystem::FindAndRemoveInfraction(ZEPlayer* player, CInfractionBase::EInfractionType type) { - FOR_EACH_VEC_BACK(m_vecInfractions, i) + for (int i = m_vecInfractions.size() - 1; i >= 0; i--) { if (m_vecInfractions[i]->GetSteamId64() == player->GetSteamId64() && m_vecInfractions[i]->GetType() == type) { m_vecInfractions[i]->UndoInfraction(player); - m_vecInfractions.Remove(i); + m_vecInfractions.erase(m_vecInfractions.begin() + i); return true; } @@ -1676,11 +1676,11 @@ bool CAdminSystem::FindAndRemoveInfraction(ZEPlayer* player, CInfractionBase::EI bool CAdminSystem::FindAndRemoveInfractionSteamId64(uint64 steamid64, CInfractionBase::EInfractionType type) { - FOR_EACH_VEC_BACK(m_vecInfractions, i) + for (int i = m_vecInfractions.size() - 1; i >= 0; i--) { if (m_vecInfractions[i]->GetSteamId64() == steamid64 && m_vecInfractions[i]->GetType() == type) { - m_vecInfractions.Remove(i); + m_vecInfractions.erase(m_vecInfractions.begin() + i); return true; } diff --git a/src/adminsystem.h b/src/adminsystem.h index 914fa58a5..8d37d47ac 100644 --- a/src/adminsystem.h +++ b/src/adminsystem.h @@ -20,7 +20,6 @@ #pragma once #include "platform.h" #include "playermanager.h" -#include "utlvector.h" #include // clang-format off @@ -196,7 +195,7 @@ class CAdminSystem private: std::map m_mapAdminGroups; std::map m_mapAdmins; - CUtlVector m_vecInfractions; + std::vector m_vecInfractions; // Implemented as a circular buffer. std::tuple m_rgDCPly[20]; From 8d94f7523de410cae9f1d38914b92322b411d926 Mon Sep 17 00:00:00 2001 From: notkoen <45914779+notkoen@users.noreply.github.com> Date: Fri, 7 Nov 2025 15:41:19 -0800 Subject: [PATCH 2/2] Convert discord vector to std::vector --- src/discord.cpp | 6 +++--- src/discord.h | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/discord.cpp b/src/discord.cpp index e3cd8bf4f..50d5ae6e1 100644 --- a/src/discord.cpp +++ b/src/discord.cpp @@ -40,7 +40,7 @@ void DiscordHttpCallback(HTTPRequestHandle request, json response) void CDiscordBotManager::PostDiscordMessage(const char* sDiscordBotName, const char* sMessage) { - FOR_EACH_VEC(m_vecDiscordBots, i) + for (int i = 0; i < m_vecDiscordBots.size(); i++) { CDiscordBot bot = m_vecDiscordBots[i]; @@ -74,7 +74,7 @@ void CDiscordBot::PostMessage(const char* sMessage) bool CDiscordBotManager::LoadDiscordBotsConfig() { - m_vecDiscordBots.Purge(); + m_vecDiscordBots.clear(); KeyValues* pKV = new KeyValues("discordbots"); KeyValues::AutoDelete autoDelete(pKV); @@ -105,7 +105,7 @@ bool CDiscordBotManager::LoadDiscordBotsConfig() ConMsg("Loaded DiscordBot config %s\n", bot.GetName()); ConMsg(" - Webhook URL: %s\n", bot.GetWebhookUrl()); ConMsg(" - Avatar URL: %s\n", bot.GetAvatarUrl()); - m_vecDiscordBots.AddToTail(bot); + m_vecDiscordBots.push_back(bot); } return true; diff --git a/src/discord.h b/src/discord.h index 58578b9e7..acdf10541 100644 --- a/src/discord.h +++ b/src/discord.h @@ -18,7 +18,6 @@ */ #include "httpmanager.h" -#include "utlvector.h" class CDiscordBot { @@ -55,7 +54,7 @@ class CDiscordBotManager bool LoadDiscordBotsConfig(); private: - CUtlVector m_vecDiscordBots; + std::vector m_vecDiscordBots; }; extern CDiscordBotManager* g_pDiscordBotManager; \ No newline at end of file