Add more hud manager convars for reducing instances of flashing

Author: Vauff

cfg/cs2fixes/cs2fixes.cfg

@@ -26,7 +26,6 @@ cs2f_prevent_using_players		0		// Whether to prevent +use from hitting players (
 cs2f_map_steamids_enable		0		// Whether to make Steam ID's available to maps
 cs2f_fix_game_bans				0		// Whether to fix CS2 game bans spreading to all new joining players
 cs2f_free_armor					0		// Whether kevlar (1+) and/or helmet (2) are given automatically
-cs2f_fix_hud_flashing			0		// Whether to fix hud flashing using a workaround, this BREAKS warmup so pick one or the other
 
 cs2f_beacon_particle			"particles/cs2fixes/admin_beacon.vpcf" // .vpcf file to be precached and used for player beacon
 
@@ -152,4 +151,9 @@ entwatch_auto_filter			1		// Whether to automatically block non-item holders fro
 entwatch_clantag 				1		// Whether to set item holder's clantag and set 9999 score
 entwatch_score					9999	// Score to give item holders (0 = dont change score at all) Requires entwatch_clantag 1
 entwatch_glow					1000	// Distance that dropped item weapon glow will be visible (0 = glow disabled)
-entwatch_glow_team				0		// Whether dropped item glow is only visible to the team the item belongs to (0 = glow to all players)
+entwatch_glow_team				0		// Whether dropped item glow is only visible to the team the item belongs to (0 = glow to all players)
+
+// Hud settings
+cs2f_fix_hud_flashing			0		// Whether to fix hud flashing using a workaround, this BREAKS warmup so pick one or the other
+cs2f_disable_hud_outside_round	0		// Whether to disable hud messages that would flash when a round is not ongoing, since flashing fix cannot run then
+cs2f_hud_duration_leeway		2		// Extra seconds duration to leave hud messages visible (without priority), reduces transition flashes between different priority messages

src/utils/hud_manager.cpp

@@ -32,6 +32,8 @@ extern IGameEventSystem* g_gameEventSystem;
 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);
+CConVar<bool> g_cvarDisableHudOutsideRound("cs2f_disable_hud_outside_round", FCVAR_NONE, "Whether to disable hud messages that would flash when a round is not ongoing, since flashing fix cannot run then", false);
+CConVar<int> g_cvarHudDurationLeeway("cs2f_hud_duration_leeway", FCVAR_NONE, "Extra seconds duration to leave hud messages visible (without priority), reduces transition flashes between different priority messages", 2);
 static std::vector<std::shared_ptr<CHudMessage>> g_vecHudMessages;
 
 bool ShouldDisplayForPlayer(ZEPlayerHandle hPlayer, EHudPriority ePriority)
@@ -48,13 +50,16 @@ bool ShouldDisplayForPlayer(ZEPlayerHandle hPlayer, EHudPriority ePriority)
 
 void CreateHudMessage(std::shared_ptr<CHudMessage> pHudMessage)
 {
+	if (g_cvarDisableHudOutsideRound.Get() && !g_pGameRules->m_bGameRestart())
+		return;
+
 	IGameEvent* pEvent = g_gameEventManager->CreateEvent("show_survival_respawn_status");
 
 	if (!pEvent)
 		return;
 
 	pEvent->SetString("loc_token", pHudMessage->GetMessage());
-	pEvent->SetInt("duration", pHudMessage->GetDuration());
+	pEvent->SetInt("duration", pHudMessage->GetDuration() + g_cvarHudDurationLeeway.Get());
 	pEvent->SetInt("userid", -1);
 
 	INetworkMessageInternal* pMsg = g_pNetworkMessages->FindNetworkMessageById(GE_Source1LegacyGameEvent);
@@ -154,8 +159,8 @@ std::string EscapeHTMLSpecialCharacters(std::string strMsg)
 		strMsg.replace(iPos, 1, "&amp;");
 
 	std::unordered_map<std::string, std::string> mapReplacements{
-		{"<", "&lt;"},
-		{">", "&gt;"},
+		{"<",  "&lt;"	},
+		{">",  "&gt;"	},
 		{"\"", "&quot;"},
 		{"\'", "&apos;"}
 	};

src/zombiereborn.cpp

@@ -1653,7 +1653,7 @@ void ZR_OnPlayerTakeDamage(CCSPlayerPawn* pVictimPawn, const CTakeDamageInfo* pI
 		auto flClassKnockback = 1.0f;
 		float flCashScale = g_cvarDamageCashScale.Get();
 
-		if(flCashScale > 0)
+		if (flCashScale > 0)
 		{
 			const auto pKillerController = pKillerPawn->GetOriginalController();
 			int money = pKillerController->m_pInGameMoneyServices->m_iAccount;