Set KILLRARITY_KILLER_BLIND flag only when fully blind

rehlds · Dec 22, 2023 · 6c9019b · 6c9019b · StevenKal · Dec 24, 2023
1 parent 0e68bed
commit 6c9019b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/regamedll/dlls/multiplay_gamerules.cpp b/regamedll/dlls/multiplay_gamerules.cpp
@@ -5264,7 +5264,7 @@ int CHalfLifeMultiplay::GetRarityOfKill(CBaseEntity *pKiller, CBasePlayer *pVict
 			if (pVictim->GetDmgPenetrationLevel() > 0)
 				iRarity |= KILLRARITY_PENETRATED;
 
-			if (pKillerPlayer->IsBlind())
+			if (pKillerPlayer->IsFullyBlind())
 				iRarity |= KILLRARITY_KILLER_BLIND;
 
 			// The killer player kills the victim with a sniper rifle with no scope

diff --git a/regamedll/dlls/player.h b/regamedll/dlls/player.h
@@ -590,6 +590,7 @@ class CBasePlayer: public CBaseMonster {
 	bool IsReloading() const;
 	bool HasTimePassedSinceDeath(float duration) const;
 	bool IsBlind() const { return (m_blindUntilTime > gpGlobals->time); }
+	bool IsFullyBlind(const float flPeekTime = 0.6f) const { return m_blindAlpha >= 255 && m_blindFadeTime > (flPeekTime * 2.0f) && (m_blindStartTime + m_blindHoldTime + flPeekTime) > gpGlobals->time; }
 	bool IsAutoFollowAllowed() const { return (gpGlobals->time > m_allowAutoFollowTime); }
 	void InhibitAutoFollow(float duration) { m_allowAutoFollowTime = gpGlobals->time + duration; }
 	void AllowAutoFollow() { m_allowAutoFollowTime = 0; }