Move hud priority to an enum

Author: Vauff

src/adminsystem.cpp

@@ -562,7 +562,7 @@ CON_COMMAND_CHAT_FLAGS(hsay, "<message> - Say something as a hud hint", ADMFLAG_
 	}
 
 	SendHudMessageAll(
-		10, 99, "<span class='fontSize-l'><span color='#FFFFFF'>ADMIN: </span><span color='#D11313'>%s</span></span>",
+		10, EHudPriority::AdminHSay, "<span class='fontSize-l'><span color='#FFFFFF'>ADMIN: </span><span color='#D11313'>%s</span></span>",
 		EscapeHTMLSpecialCharacters(args.ArgS()).c_str());
 }
 

src/utils/hud_manager.cpp

@@ -34,12 +34,12 @@ extern CGlobalVars* GetGlobals();
 CConVar<bool> g_cvarFixHudFlashing("cs2f_fix_hud_flashing", FCVAR_NONE, "Whether to fix hud flashing using a workaround, this BREAKS warmup so pick one or the other", false);
 static std::vector<std::shared_ptr<CHudMessage>> g_vecHudMessages;
 
-bool ShouldDisplayForPlayer(ZEPlayerHandle hPlayer, int iPriority)
+bool ShouldDisplayForPlayer(ZEPlayerHandle hPlayer, EHudPriority ePriority)
 {
 	for (std::shared_ptr<CHudMessage> pHudMessage : g_vecHudMessages)
 	{
 		// Require higher priority to block, so if priority matches most recent message takes precedence
-		if (pHudMessage->HasRecipient(hPlayer) && pHudMessage->GetPriority() > iPriority)
+		if (pHudMessage->HasRecipient(hPlayer) && pHudMessage->GetPriority() > ePriority)
 			return false;
 	}
 
@@ -88,7 +88,7 @@ void CreateHudMessage(std::shared_ptr<CHudMessage> pHudMessage)
 	g_gameEventManager->FreeEvent(pEvent);
 }
 
-void SendHudMessage(ZEPlayer* pPlayer, int iDuration, int iPriority, const char* pszMessage, ...)
+void SendHudMessage(ZEPlayer* pPlayer, int iDuration, EHudPriority ePriority, const char* pszMessage, ...)
 {
 	va_list args;
 	va_start(args, pszMessage);
@@ -98,13 +98,13 @@ void SendHudMessage(ZEPlayer* pPlayer, int iDuration, int iPriority, const char*
 
 	va_end(args);
 
-	std::shared_ptr<CHudMessage> pHudMessage = std::make_shared<CHudMessage>(buf, iDuration, iPriority);
+	std::shared_ptr<CHudMessage> pHudMessage = std::make_shared<CHudMessage>(buf, iDuration, ePriority);
 
 	pHudMessage->AddRecipient(pPlayer->GetHandle());
 	CreateHudMessage(pHudMessage);
 }
 
-void SendHudMessageAll(int iDuration, int iPriority, const char* pszMessage, ...)
+void SendHudMessageAll(int iDuration, EHudPriority ePriority, const char* pszMessage, ...)
 {
 	if (!GetGlobals())
 		return;
@@ -117,7 +117,7 @@ void SendHudMessageAll(int iDuration, int iPriority, const char* pszMessage, ...
 
 	va_end(args);
 
-	std::shared_ptr<CHudMessage> pHudMessage = std::make_shared<CHudMessage>(buf, iDuration, iPriority);
+	std::shared_ptr<CHudMessage> pHudMessage = std::make_shared<CHudMessage>(buf, iDuration, ePriority);
 
 	for (int i = 0; i < GetGlobals()->maxClients; i++)
 	{

src/utils/hud_manager.h

@@ -23,34 +23,40 @@
 #include <string>
 #include <vector>
 
+enum class EHudPriority
+{
+	InfectionCountdown = 2,
+	AdminHSay = 99
+};
+
 class CHudMessage
 {
 public:
-	CHudMessage(std::string sMessage, int iDuration, int iPriority)
+	CHudMessage(std::string sMessage, int iDuration, EHudPriority ePriority)
 	{
 		m_strMessage = sMessage;
 		m_iDuration = iDuration;
-		m_iPriority = iPriority;
+		m_ePriority = ePriority;
 	}
 
 	const char* GetMessage() { return m_strMessage.c_str(); };
 	int GetDuration() { return m_iDuration; };
-	int GetPriority() { return m_iPriority; };
+	EHudPriority GetPriority() { return m_ePriority; };
 	std::vector<ZEPlayerHandle> GetRecipients() { return m_vecRecipients; };
 	bool HasRecipient(ZEPlayerHandle hPlayer) { return std::find(m_vecRecipients.begin(), m_vecRecipients.end(), hPlayer) != m_vecRecipients.end(); };
 	void AddRecipient(ZEPlayerHandle hPlayer) { m_vecRecipients.push_back(hPlayer); };
 
 private:
 	std::string m_strMessage;
 	int m_iDuration;
-	int m_iPriority;
+	EHudPriority m_ePriority;
 	std::vector<ZEPlayerHandle> m_vecRecipients;
 };
 
 // When multiple hud messages are active, whichever one has highest priority one will display
 // Note this is a basic implementation (TODO: is this worth expanding?), so e.g. a previously sent lower priority message will not display once a higher priority one expires
-void SendHudMessage(ZEPlayer* pPlayer, int iDuration, int iPriority, const char* pszMessage, ...);
-void SendHudMessageAll(int iDuration, int iPriority, const char* pszMessage, ...);
+void SendHudMessage(ZEPlayer* pPlayer, int iDuration, EHudPriority ePriority, const char* pszMessage, ...);
+void SendHudMessageAll(int iDuration, EHudPriority ePriority, const char* pszMessage, ...);
 
 void StartFlashingFixTimer();
 std::string EscapeHTMLSpecialCharacters(std::string strMsg);

src/zombiereborn.cpp

@@ -1435,7 +1435,7 @@ void ZR_InitialInfection()
 	if (g_cvarRespawnDelay.Get() < 0.0f)
 		g_bRespawnEnabled = false;
 
-	SendHudMessageAll(4, 2, "First infection has started!");
+	SendHudMessageAll(4, EHudPriority::InfectionCountdown, "First infection has started!");
 	ClientPrintAll(HUD_PRINTTALK, ZR_PREFIX "First infection has started! Good luck, survivors!");
 	g_ZRRoundState = EZRRoundState::POST_INFECTION;
 }
@@ -1469,7 +1469,7 @@ void ZR_StartInitialCountdown()
 			else
 				V_snprintf(classicSpawnMsg, sizeof(classicSpawnMsg), "");
 
-			SendHudMessageAll(2, 2, "%sFirst infection in <span color='#00FF00'>%i %s</span>!", classicSpawnMsg, g_iInfectionCountDown, g_iInfectionCountDown == 1 ? "second" : "seconds");
+			SendHudMessageAll(2, EHudPriority::InfectionCountdown, "%sFirst infection in <span color='#00FF00'>%i %s</span>!", classicSpawnMsg, g_iInfectionCountDown, g_iInfectionCountDown == 1 ? "second" : "seconds");
 
 			if (g_iInfectionCountDown % 5 == 0)
 				ClientPrintAll(HUD_PRINTTALK, "%sFirst infection in \7%i %s\1!", ZR_PREFIX, g_iInfectionCountDown, g_iInfectionCountDown == 1 ? "second" : "seconds");