Convert remaining unnecessary CUtlVector usages

Other than in detour system, because that's removed in KHook branch

Author: Vauff

src/entities.cpp

@@ -494,7 +494,7 @@ namespace CPointViewControlHandler
 {
 	struct ViewControl
 	{
-		CUtlVector<CHandle<CCSPlayerPawn>> m_players;
+		std::vector<CHandle<CCSPlayerPawn>> m_players;
 		std::string m_viewTarget;
 		std::string m_name;
 	};
@@ -590,22 +590,24 @@ namespace CPointViewControlHandler
 
 		for (auto& [vk, vc] : s_repository)
 		{
-			if (const auto index = vc.m_players.Find(handle); index > -1)
+			const auto iterator = std::find(vc.m_players.begin(), vc.m_players.end(), handle);
+			if (iterator != vc.m_players.end())
 			{
 				if (vk == static_cast<uint>(key))
 				{
 					Warning("PointViewControl %s was enabled twice in a row! player: %s\n", vc.m_name.c_str(), pController->GetPlayerName().c_str());
 					return false;
 				}
 
-				vc.m_players.Remove(index);
+				vc.m_players.erase(iterator);
 				UpdatePlayerState(pPawn, INVALID_HANDLE, false, RESET_FOV);
 				Warning("PointViewControl %s already enabled for %s\n", vc.m_name.c_str(), pController->GetPlayerName().c_str());
 				break;
 			}
 		}
 
-		return it->second.m_players.AddToTail(handle) >= 0;
+		it->second.m_players.push_back(handle);
+		return true;
 	}
 	bool OnDisable(CPointViewControl* pEntity, CBaseEntity* pActivator)
 	{
@@ -632,7 +634,14 @@ namespace CPointViewControlHandler
 
 		UpdatePlayerState(pPawn, INVALID_HANDLE, false, RESET_FOV);
 
-		return it->second.m_players.FindAndRemove(handle);
+		auto& vecPlayers = it->second.m_players;
+		auto iterator = std::find(vecPlayers.begin(), vecPlayers.end(), handle);
+
+		if (iterator == vecPlayers.end())
+			return false;
+
+		vecPlayers.erase(iterator);
+		return true;
 	}
 	bool OnEnableAll(CPointViewControl* pEntity)
 	{
@@ -655,17 +664,19 @@ namespace CPointViewControlHandler
 
 			for (auto& [vk, vc] : s_repository)
 			{
-				if (const auto index = vc.m_players.Find(handle); index > -1)
+				auto iterator = std::find(vc.m_players.begin(), vc.m_players.end(), handle);
+
+				if (iterator != vc.m_players.end())
 				{
-					vc.m_players.Remove(index);
+					vc.m_players.erase(iterator);
 					if (vk == static_cast<uint>(key))
 						continue;
 					UpdatePlayerState(pPawn, INVALID_HANDLE, false, RESET_FOV);
 					Warning("PointViewControl %s already enabled for %s\n", vc.m_name.c_str(), pController->GetPlayerName().c_str());
 				}
 			}
 
-			it->second.m_players.AddToTail(handle);
+			it->second.m_players.push_back(handle);
 		}
 
 		return true;
@@ -677,15 +688,11 @@ namespace CPointViewControlHandler
 		if (it == s_repository.end())
 			return false;
 
-		FOR_EACH_VEC(it->second.m_players, i)
-		{
-			const auto& handle = it->second.m_players.Element(i);
-
-			if (const auto player = handle.Get())
+		for (auto hPawn : it->second.m_players)
+			if (CCSPlayerPawn* player = hPawn.Get())
 				UpdatePlayerState(player, INVALID_HANDLE, false, RESET_FOV);
-		}
 
-		it->second.m_players.Purge();
+		it->second.m_players.clear();
 
 		return true;
 	}
@@ -698,13 +705,9 @@ namespace CPointViewControlHandler
 			const auto entity = CHandle<CPointViewControl>(it->first).Get();
 			if (!entity)
 			{
-				FOR_EACH_VEC(it->second.m_players, i)
-				{
-					const auto& handle = it->second.m_players.Element(i);
-
-					if (const auto player = handle.Get())
+				for (auto hPawn : it->second.m_players)
+					if (CCSPlayerPawn* player = hPawn.Get())
 						UpdatePlayerState(player, INVALID_HANDLE, false, RESET_FOV);
-				}
 
 				it = s_repository.erase(it);
 			}
@@ -725,68 +728,58 @@ namespace CPointViewControlHandler
 				continue;
 			}
 
-			if (vc.m_players.Count() == 0)
+			if (vc.m_players.empty())
 				continue;
 
 			const auto pTarget = entity->GetTargetCameraEntity();
 			if (!pTarget)
 			{
-				FOR_EACH_VEC(vc.m_players, i)
-				{
-					const auto& handle = vc.m_players.Element(i);
-
-					if (const auto player = handle.Get())
+				for (auto hPawn : vc.m_players)
+					if (CCSPlayerPawn* player = hPawn.Get())
 						UpdatePlayerState(player, INVALID_HANDLE, false, RESET_FOV);
-				}
-				vc.m_players.Purge();
+				vc.m_players.clear();
 				continue;
 			}
 
-			FOR_EACH_VEC(vc.m_players, i)
+			for (auto iterator = vc.m_players.begin(); iterator != vc.m_players.end();)
 			{
-				const auto& handle = vc.m_players.Element(i);
-				const auto player = handle.Get();
+				auto hPawn = *iterator;
+				CCSPlayerPawn* player = hPawn.Get();
 				if (!player)
 				{
-					vc.m_players.Remove(i--);
+					iterator = vc.m_players.erase(iterator);
 					continue;
 				}
 				if (!player->IsAlive())
 				{
 					UpdatePlayerState(player, INVALID_HANDLE, false, RESET_FOV);
-					vc.m_players.Remove(i--);
+					iterator = vc.m_players.erase(iterator);
 					continue;
 				}
 
 				UpdatePlayerState(player, pTarget->GetHandle(), entity->HasFrozen(), entity->HasFOV() ? entity->GetFOV() : INVALID_FOV, entity->HasDisarm());
+				iterator++;
 			}
 		}
 	}
 	bool IsViewControl(CCSPlayerPawn* pPawn)
 	{
-		const auto handle = pPawn->GetHandle().ToInt();
 		for (const auto& [vk, vc] : s_repository)
 		{
-			FOR_EACH_VEC(vc.m_players, i)
-			{
-				if (vc.m_players.Element(i).ToInt() == handle)
+			for (auto hPawn : vc.m_players)
+				if (hPawn == pPawn->GetHandle())
 					return true;
-			}
 		}
 		return false;
 	}
 	void Shutdown()
 	{
 		for (auto& [vk, vc] : s_repository)
 		{
-			FOR_EACH_VEC(vc.m_players, i)
-			{
-				const auto& handle = vc.m_players.Element(i);
-
-				if (const auto player = handle.Get())
+			for (auto hPawn : vc.m_players)
+				if (CCSPlayerPawn* player = hPawn.Get())
 					UpdatePlayerState(player, INVALID_HANDLE, false, RESET_FOV);
-			}
-			vc.m_players.Purge();
+			vc.m_players.clear();
 		}
 		s_repository.clear();
 	}

src/eventlistener.h

@@ -21,11 +21,10 @@
 #include "common.h"
 #include "igameevents.h"
 #include "utlstring.h"
-#include "utlvector.h"
 
 class CGameEventListener;
 
-extern CUtlVector<CGameEventListener*> g_vecEventListeners;
+extern std::vector<CGameEventListener*> g_vecEventListeners;
 extern CConVar<int> g_cvarFreeArmor;
 
 typedef void (*FnEventListenerCallback)(IGameEvent* event);
@@ -36,7 +35,7 @@ class CGameEventListener : public IGameEventListener2
 	CGameEventListener(FnEventListenerCallback callback, const char* pszEventName) :
 		m_Callback(callback), m_pszEventName(pszEventName)
 	{
-		g_vecEventListeners.AddToTail(this);
+		g_vecEventListeners.push_back(this);
 	}
 
 	~CGameEventListener() override

src/events.cpp

@@ -39,7 +39,7 @@
 
 #include "tier0/memdbgon.h"
 
-CUtlVector<CGameEventListener*> g_vecEventListeners;
+std::vector<CGameEventListener*> g_vecEventListeners;
 
 void RegisterEventListeners()
 {
@@ -48,10 +48,8 @@ void RegisterEventListeners()
 	if (bRegistered || !g_gameEventManager)
 		return;
 
-	FOR_EACH_VEC(g_vecEventListeners, i)
-	{
-		g_gameEventManager->AddListener(g_vecEventListeners[i], g_vecEventListeners[i]->GetEventName(), true);
-	}
+	for (CGameEventListener* pListener : g_vecEventListeners)
+		g_gameEventManager->AddListener(pListener, pListener->GetEventName(), true);
 
 	bRegistered = true;
 }
@@ -61,12 +59,10 @@ void UnregisterEventListeners()
 	if (!g_gameEventManager)
 		return;
 
-	FOR_EACH_VEC(g_vecEventListeners, i)
-	{
-		g_gameEventManager->RemoveListener(g_vecEventListeners[i]);
-	}
+	for (CGameEventListener* pListener : g_vecEventListeners)
+		g_gameEventManager->RemoveListener(pListener);
 
-	g_vecEventListeners.Purge();
+	g_vecEventListeners.clear();
 }
 
 GAME_EVENT_F(round_prestart)

src/playermanager.cpp

@@ -421,36 +421,30 @@ void ZEPlayer::CreateMark(float fDuration, Vector vecOrigin)
 
 int ZEPlayer::GetLeaderVoteCount()
 {
-	int iValidVoteCount = 0;
-
-	for (int i = m_vecLeaderVotes.Count() - 1; i >= 0; i--)
-		if (m_vecLeaderVotes[i].IsValid())
-			iValidVoteCount++;
-		else
-			m_vecLeaderVotes.Remove(i);
+	std::erase_if(m_vecLeaderVotes, [](ZEPlayerHandle hPlayer) {
+		return !hPlayer.IsValid();
+	});
 
-	return iValidVoteCount;
+	return m_vecLeaderVotes.size();
 }
 
 bool ZEPlayer::HasPlayerVotedLeader(ZEPlayer* pPlayer)
 {
-	FOR_EACH_VEC(m_vecLeaderVotes, i)
-	{
-		if (m_vecLeaderVotes[i] == pPlayer)
+	for (ZEPlayerHandle hPlayer : m_vecLeaderVotes)
+		if (hPlayer == pPlayer)
 			return true;
-	}
 
 	return false;
 }
 
 void ZEPlayer::AddLeaderVote(ZEPlayer* pPlayer)
 {
-	m_vecLeaderVotes.AddToTail(pPlayer->GetHandle());
+	m_vecLeaderVotes.push_back(pPlayer->GetHandle());
 }
 
 void ZEPlayer::PurgeLeaderVotes()
 {
-	m_vecLeaderVotes.Purge();
+	m_vecLeaderVotes.clear();
 }
 
 void ZEPlayer::StartGlow(Color color, int duration)

src/playermanager.h

@@ -376,7 +376,7 @@ class ZEPlayer
 	Color m_colorTracer;
 	Color m_colorGlow;
 	Color m_colorBeacon;
-	CUtlVector<ZEPlayerHandle> m_vecLeaderVotes;
+	std::vector<ZEPlayerHandle> m_vecLeaderVotes;
 	float m_flLeaderVoteTime;
 	CHandle<CBaseModelEntity> m_hGlowModel;
 	float m_flSpeedMod;
@@ -404,9 +404,9 @@ class CPlayerManager
 		V_memset(m_vecPlayers, 0, sizeof(m_vecPlayers));
 		m_nUsingStopSound = -1; // On by default
 		m_nUsingSilenceSound = 0;
-		m_nUsingZSounds = -1;	 // On by default
+		m_nUsingZSounds = -1;		// On by default
 		m_nUsingZSoundsInfect = -1; // On by default
-		m_nUsingStopDecals = -1; // On by default
+		m_nUsingStopDecals = -1;	// On by default
 		m_nUsingNoShake = 0;
 	}
 

src/zombiereborn.cpp

@@ -1261,7 +1261,7 @@ void ZR_InfectMotherZombie(CCSPlayerController* pVictimController, std::vector<S
 
 	ZEPlayerHandle hPlayer = pZEPlayer->GetHandle();
 	CTimer::Create(rand() % (int)g_cvarMoanInterval.Get(), TIMERFLAG_MAP | TIMERFLAG_ROUND, [hPlayer]() { return ZR_MoanTimer(hPlayer); });
-	
+
 	g_MotherZombies.push_back(hPlayer);
 }