Add CVar states naming

wopox1337 · Feb 6, 2020 · 1268de3 · 1268de3
1 parent 7aab520
commit 1268de3
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/regamedll/dlls/API/CSPlayer.cpp b/regamedll/dlls/API/CSPlayer.cpp
@@ -61,7 +61,7 @@ EXT_FUNC bool CCSPlayer::JoinTeam(TeamName team)
 #ifndef REGAMEDLL_ADD
 		if (fadetoblack.value)
 #else
-		if ((int)fadetoblack.value == 1)
+		if ((int)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
@@ -1905,7 +1905,7 @@ BOOL EXT_FUNC __API_HOOK(HandleMenu_ChooseTeam)(CBasePlayer *pPlayer, int slot)
 #ifndef REGAMEDLL_ADD
 			if (fadetoblack.value)
 #else
-			if ((int)fadetoblack.value == 1)
+			if ((int)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
@@ -7,7 +7,7 @@ void PlayerBlind(CBasePlayer *pPlayer, entvars_t *pevInflictor, entvars_t *pevAt
 #ifndef REGAMEDLL_ADD
 	if (!fadetoblack.value)
 #else
-	if ((int)fadetoblack.value != 1)
+	if ((int)fadetoblack.value != FADETOBLACK_STAY)
 #endif
 	{
 		for (int i = 1; i <= gpGlobals->maxClients; i++)

diff --git a/regamedll/dlls/multiplay_gamerules.cpp b/regamedll/dlls/multiplay_gamerules.cpp
@@ -2367,7 +2367,7 @@ void CHalfLifeMultiplay::Think()
 #ifndef REGAMEDLL_ADD
 			WRITE_BYTE(fadetoblack.value != 0);
 #else
-			WRITE_BYTE((int)fadetoblack.value == 1);
+			WRITE_BYTE((int)fadetoblack.value == FADETOBLACK_STAY);
 #endif
 		MESSAGE_END();
 
@@ -3384,7 +3384,7 @@ void CHalfLifeMultiplay::InitHUD(CBasePlayer *pl)
 #ifndef REGAMEDLL_ADD
 		WRITE_BYTE(fadetoblack.value != 0);
 #else
-		WRITE_BYTE((int)fadetoblack.value == 1);
+		WRITE_BYTE((int)fadetoblack.value == FADETOBLACK_STAY);
 #endif
 	MESSAGE_END();
 
@@ -3776,7 +3776,7 @@ BOOL EXT_FUNC CHalfLifeMultiplay::__API_HOOK(FPlayerCanRespawn)(CBasePlayer *pPl
 #ifndef REGAMEDLL_ADD
 					if (fadetoblack.value != 0.0f)
 #else
-					if ((int)fadetoblack.value == 1)
+					if ((int)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
@@ -9,7 +9,7 @@ int __API_HOOK(GetForceCamera)(CBasePlayer *pObserver)
 #ifndef REGAMEDLL_ADD
 	if (!fadetoblack.value)
 #else
-	if ((int)fadetoblack.value == 1)
+	if ((int)fadetoblack.value == FADETOBLACK_STAY)
 #endif
 	{
 		retVal = int(CVAR_GET_FLOAT("mp_forcechasecam"));
@@ -46,7 +46,7 @@ void UpdateClientEffects(CBasePlayer *pObserver, int oldMode)
 #ifndef REGAMEDLL_ADD
 	bool blindnessOk = (fadetoblack.value == 0);
 #else
-	bool blindnessOk = ((int)fadetoblack.value != 1);
+	bool blindnessOk = ((int)fadetoblack.value != FADETOBLACK_STAY);
 #endif
 	bool clearNightvision = false;
 

diff --git a/regamedll/dlls/observer.h b/regamedll/dlls/observer.h
@@ -32,6 +32,10 @@
 #define CAMERA_MODE_SPEC_ONLY_TEAM         1
 #define CAMERA_MODE_SPEC_ONLY_FIRST_PERSON 2
 
+#define FADETOBLACK_OFF       0
+#define FADETOBLACK_STAY      1
+#define FADETOBLACK_AT_DIYING 2
+
 int GetForceCamera(CBasePlayer *pObserver);
 void UpdateClientEffects(CBasePlayer *pObserver, int oldMode);
 

diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
@@ -2095,12 +2095,12 @@ void EXT_FUNC CBasePlayer::__API_HOOK(Killed)(entvars_t *pevAttacker, int iGib)
 
 		break;
 	}
-	case 1:
+	case FADETOBLACK_STAY:
 	{
 		UTIL_ScreenFade(this, Vector(0, 0, 0), 3, 3, 255, (FFADE_OUT | FFADE_STAYOUT));
 		break;
 	}
-	case 2:
+	case FADETOBLACK_AT_DIYING:
 	{
 		pev->iuser1 = OBS_CHASE_FREE;
 		pev->iuser2 = ENTINDEX(edict());