From 606c6e2533ac49606b941f7572cec7c7d07ba62c Mon Sep 17 00:00:00 2001
From: Sergey Shorokhov <wopox1337@ya.ru>
Date: Fri, 14 Jul 2023 05:47:25 +0300
Subject: [PATCH] change fadeblack conditions

---
 regamedll/dlls/API/CSPlayer.cpp        | 4 ----
 regamedll/dlls/client.cpp              | 4 ----
 regamedll/dlls/combat.cpp              | 6 +-----
 regamedll/dlls/multiplay_gamerules.cpp | 8 ++------
 regamedll/dlls/observer.cpp            | 8 --------
 5 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/regamedll/dlls/API/CSPlayer.cpp b/regamedll/dlls/API/CSPlayer.cpp
index 8111732d3..c59c314b9 100644
--- a/regamedll/dlls/API/CSPlayer.cpp
+++ b/regamedll/dlls/API/CSPlayer.cpp
@@ -58,11 +58,7 @@ EXT_FUNC bool CCSPlayer::JoinTeam(TeamName team)
 		pPlayer->StartObserver(pentSpawnSpot->v.origin, pentSpawnSpot->v.angles);
 
 		// do we have fadetoblack on? (need to fade their screen back in)
-#ifndef REGAMEDLL_ADD
-		if (fadetoblack.value)
-#else
 		if (fadetoblack.value == FADETOBLACK_STAY)
-#endif
 		{
 			UTIL_ScreenFade(pPlayer, Vector(0, 0, 0), 0.001, 0, 0, FFADE_IN);
 		}
diff --git a/regamedll/dlls/client.cpp b/regamedll/dlls/client.cpp
index a2647190d..22f58938b 100644
--- a/regamedll/dlls/client.cpp
+++ b/regamedll/dlls/client.cpp
@@ -1911,11 +1911,7 @@ BOOL EXT_FUNC __API_HOOK(HandleMenu_ChooseTeam)(CBasePlayer *pPlayer, int slot)
 			MESSAGE_END();
 #endif
 			// do we have fadetoblack on? (need to fade their screen back in)
-#ifndef REGAMEDLL_ADD
-			if (fadetoblack.value)
-#else
 			if (fadetoblack.value == FADETOBLACK_STAY)
-#endif
 			{
 				UTIL_ScreenFade(pPlayer, Vector(0, 0, 0), 0.001, 0, 0, FFADE_IN);
 			}
diff --git a/regamedll/dlls/combat.cpp b/regamedll/dlls/combat.cpp
index 11e209794..390c8d613 100644
--- a/regamedll/dlls/combat.cpp
+++ b/regamedll/dlls/combat.cpp
@@ -4,11 +4,7 @@ void PlayerBlind(CBasePlayer *pPlayer, entvars_t *pevInflictor, entvars_t *pevAt
 {
 	UTIL_ScreenFade(pPlayer, color, fadeTime, fadeHold, alpha, 0);
 
-	if (!fadetoblack.value
-#ifdef REGAMEDLL_ADD
-		|| fadetoblack.value == FADETOBLACK_AT_DYING
-#endif
-		)
+	if (fadetoblack.value != FADETOBLACK_STAY)
 	{
 		for (int i = 1; i <= gpGlobals->maxClients; i++)
 		{
diff --git a/regamedll/dlls/multiplay_gamerules.cpp b/regamedll/dlls/multiplay_gamerules.cpp
index 19b774fc1..03948aafa 100644
--- a/regamedll/dlls/multiplay_gamerules.cpp
+++ b/regamedll/dlls/multiplay_gamerules.cpp
@@ -2393,7 +2393,7 @@ void CHalfLifeMultiplay::Think()
 		MESSAGE_BEGIN(MSG_ALL, gmsgForceCam);
 			WRITE_BYTE(forcecamera.value != 0);
 			WRITE_BYTE(forcechasecam.value != 0);
-			WRITE_BYTE(fadetoblack.value != 0);
+			WRITE_BYTE(fadetoblack.value == FADETOBLACK_STAY);
 		MESSAGE_END();
 
 		m_flForceCameraValue = forcecamera.value;
@@ -3456,7 +3456,7 @@ void CHalfLifeMultiplay::InitHUD(CBasePlayer *pl)
 	MESSAGE_BEGIN(MSG_ONE, gmsgForceCam, nullptr, pl->edict());
 		WRITE_BYTE(forcecamera.value != 0);
 		WRITE_BYTE(forcechasecam.value != 0);
-		WRITE_BYTE(fadetoblack.value != 0);
+		WRITE_BYTE(fadetoblack.value == FADETOBLACK_STAY);
 	MESSAGE_END();
 
 	if (m_bGameOver)
@@ -3874,11 +3874,7 @@ BOOL EXT_FUNC CHalfLifeMultiplay::__API_HOOK(FPlayerCanRespawn)(CBasePlayer *pPl
 				{
 					// If this player just connected and fadetoblack is on, then maybe
 					// the server admin doesn't want him peeking around.
-#ifndef REGAMEDLL_ADD
-					if (fadetoblack.value != 0.0f)
-#else
 					if (fadetoblack.value == FADETOBLACK_STAY)
-#endif
 					{
 						UTIL_ScreenFade(pPlayer, Vector(0, 0, 0), 3, 3, 255, (FFADE_OUT | FFADE_STAYOUT));
 					}
diff --git a/regamedll/dlls/observer.cpp b/regamedll/dlls/observer.cpp
index 7020195ab..c35b17f9a 100644
--- a/regamedll/dlls/observer.cpp
+++ b/regamedll/dlls/observer.cpp
@@ -6,11 +6,7 @@ int __API_HOOK(GetForceCamera)(CBasePlayer *pObserver)
 {
 	int retVal;
 
-#ifndef REGAMEDLL_ADD
-	if (!fadetoblack.value)
-#else
 	if (fadetoblack.value != FADETOBLACK_STAY)
-#endif
 	{
 		retVal = int(CVAR_GET_FLOAT("mp_forcechasecam"));
 
@@ -55,11 +51,7 @@ void UpdateClientEffects(CBasePlayer *pObserver, int oldMode)
 {
 	bool clearProgress = false;
 	bool clearBlindness = false;
-#ifndef REGAMEDLL_ADD
-	bool blindnessOk = (fadetoblack.value == 0);
-#else
 	bool blindnessOk = (fadetoblack.value != FADETOBLACK_STAY);
-#endif
 	bool clearNightvision = false;
 
 	if (pObserver->GetObserverMode() == OBS_IN_EYE)