diff --git a/README.md b/README.md
index e45f8aea..5d43c508 100644
--- a/README.md
+++ b/README.md
@@ -73,8 +73,8 @@ Archive's bin directory contains 2 subdirectories, 'bugfixed' and 'pure'
| mp_allow_point_servercommand | 0 | 0 | 1 | Allow use of point_servercommand entities in map.
`0` disallow
`1` allow
`NOTE`: Potentially dangerous for untrusted maps. |
| mp_hullbounds_sets | 1 | 0 | 1 | Sets mins/maxs hull bounds for the player.
`0` disabled
`1` enabled |
| mp_unduck_method | 0 | 0 | 1 | Don't unduck if ducking isn't finished yet.
`0` disabled
`1` enabled
`NOTE`: This also prevents double duck. |
-| mp_scoreboard_showhealth | 3 | 0 | 5 | Show `HP` field into a scoreboard.
`0` don't send any update for `HP` field to any clients
`1` show only Terrorist `HP` field to all clients
`2` show only CT `HP` field to all clients
`3` show `HP` field to teammates
`4` show `HP` field to all clients
`5` show `HP` field to teammates and spectators
`Note this CVar are work in beta only.` |
-| mp_scoreboard_showmoney | 3 | 0 | 5 | Show `Money` field into a scoreboard.
`0` don't send any update for `Money` field to any clients
`1` show only Terrorist `Money` field to all clients
`2` show only CT `Money` field to all clients
`3` show `Money` field to teammates
`4` show `Money` field to all clients
`5` show `Money` field to teammates and spectators
`Note this CVar are work in beta only.` |
+| mp_scoreboard_showhealth | 3 | 0 | 5 | Show `HP` field into a scoreboard.
`0` don't send any update for `HP` field to any clients
`1` show only Terrorist `HP` field to all clients
`2` show only CT `HP` field to all clients
`3` show `HP` field to teammates
`4` show `HP` field to all clients
`5` show `HP` field to teammates and spectators |
+| mp_scoreboard_showmoney | 3 | 0 | 5 | Show `Money` field into a scoreboard.
`0` don't send any update for `Money` field to any clients
`1` show only Terrorist `Money` field to all clients
`2` show only CT `Money` field to all clients
`3` show `Money` field to teammates
`4` show `Money` field to all clients
`5` show `Money` field to teammates and spectators |
| ff_damage_reduction_bullets | 0.35 | 0.0 | 1.0 | How much to reduce damage done to teammates when shot.
Range is from `0` - `1` (with 1 being damage equal to what is done to an enemy) |
| ff_damage_reduction_grenade | 0.25 | 0.0 | 1.0 | How much to reduce damage done to teammates by a thrown grenade.
Range is from `0` - `1` (with 1 being damage equal to what is done to an enemy) |
| ff_damage_reduction_grenade_self | 1.0 | 0.0 | 1.0 | How much to damage a player does to himself with his own grenade.
Range is from `0` - `1` (with 1 being damage equal to what is done to an enemy) |
diff --git a/dist/game.cfg b/dist/game.cfg
index 473cff62..111488d1 100644
--- a/dist/game.cfg
+++ b/dist/game.cfg
@@ -259,7 +259,6 @@ mp_allow_point_servercommand 0
// 3 - show 'HP' field to teammates
// 4 - show 'HP' field to all clients
// 5 - show 'HP' field to teammates and spectators
-// Note this CVar are work in beta only.
//
// Default value: "3"
mp_scoreboard_showhealth 3
@@ -271,7 +270,6 @@ mp_scoreboard_showhealth 3
// 3 - show 'Money' field to teammates
// 4 - show 'Money' field to all clients
// 5 - show 'Money' field to teammates and spectators
-// Note this CVar are work in beta only.
//
// Default value: "3"
mp_scoreboard_showmoney 3
diff --git a/regamedll/dlls/client.cpp b/regamedll/dlls/client.cpp
index 61e47105..c1afbdd0 100644
--- a/regamedll/dlls/client.cpp
+++ b/regamedll/dlls/client.cpp
@@ -225,11 +225,8 @@ void LinkUserMessages()
gmsgHudTextArgs = REG_USER_MSG("HudTextArgs", -1);
#ifdef BUILD_LATEST
- if (AreRunningBeta())
- {
- gmsgAccount = REG_USER_MSG("Account", 5);
- gmsgHealthInfo = REG_USER_MSG("HealthInfo", 5);
- }
+ gmsgAccount = REG_USER_MSG("Account", 5);
+ gmsgHealthInfo = REG_USER_MSG("HealthInfo", 5);
#endif
}
diff --git a/regamedll/dlls/game.cpp b/regamedll/dlls/game.cpp
index e51a19e3..434382f7 100644
--- a/regamedll/dlls/game.cpp
+++ b/regamedll/dlls/game.cpp
@@ -251,11 +251,8 @@ void EXT_FUNC GameDLLInit()
CVAR_REGISTER(&humans_join_team);
#ifdef BUILD_LATEST
- if (AreRunningBeta())
- {
- CVAR_REGISTER(&scoreboard_showhealth);
- CVAR_REGISTER(&scoreboard_showmoney);
- }
+ CVAR_REGISTER(&scoreboard_showhealth);
+ CVAR_REGISTER(&scoreboard_showmoney);
#endif
// Remove unused cvars
diff --git a/regamedll/dlls/multiplay_gamerules.cpp b/regamedll/dlls/multiplay_gamerules.cpp
index 6a714041..091a928a 100644
--- a/regamedll/dlls/multiplay_gamerules.cpp
+++ b/regamedll/dlls/multiplay_gamerules.cpp
@@ -3426,18 +3426,15 @@ void CHalfLifeMultiplay::InitHUD(CBasePlayer *pl)
}
#ifdef BUILD_LATEST
- if (AreRunningBeta())
- {
- MESSAGE_BEGIN(MSG_ONE, gmsgHealthInfo, nullptr, pl->edict());
- WRITE_BYTE(plr->entindex());
- WRITE_LONG(plr->ShouldToShowHealthInfo(pl) ? plr->m_iClientHealth : -1 /* means that 'HP' field will be hidden */);
- MESSAGE_END();
+ MESSAGE_BEGIN(MSG_ONE, gmsgHealthInfo, nullptr, pl->edict());
+ WRITE_BYTE(plr->entindex());
+ WRITE_LONG(plr->ShouldToShowHealthInfo(pl) ? plr->m_iClientHealth : -1 /* means that 'HP' field will be hidden */);
+ MESSAGE_END();
- MESSAGE_BEGIN(MSG_ONE, gmsgAccount, nullptr, pl->edict());
- WRITE_BYTE(plr->entindex());
- WRITE_LONG(plr->ShouldToShowAccount(pl) ? plr->m_iAccount : -1 /* means that this 'Money' will be hidden */);
- MESSAGE_END();
- }
+ MESSAGE_BEGIN(MSG_ONE, gmsgAccount, nullptr, pl->edict());
+ WRITE_BYTE(plr->entindex());
+ WRITE_LONG(plr->ShouldToShowAccount(pl) ? plr->m_iAccount : -1 /* means that this 'Money' will be hidden */);
+ MESSAGE_END();
#endif // BUILD_LATEST
}
diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
index 25f822ff..df4f54a8 100644
--- a/regamedll/dlls/player.cpp
+++ b/regamedll/dlls/player.cpp
@@ -5183,7 +5183,7 @@ void CBasePlayer::SetScoreAttrib(CBasePlayer *dest)
state |= SCORE_STATUS_VIP;
#ifdef BUILD_LATEST
- if (AreRunningBeta() && m_bHasDefuser)
+ if (m_bHasDefuser)
state |= SCORE_STATUS_DEFKIT;
#endif
@@ -7206,41 +7206,38 @@ void EXT_FUNC CBasePlayer::__API_HOOK(UpdateClientData)()
}
#ifdef BUILD_LATEST
- if (AreRunningBeta())
+ if ((m_iTeam == CT || m_iTeam == TERRORIST) &&
+ (m_iLastAccount != m_iAccount || m_iLastClientHealth != m_iClientHealth || m_tmNextAccountHealthUpdate < gpGlobals->time))
{
- if ((m_iTeam == CT || m_iTeam == TERRORIST) &&
- (m_iLastAccount != m_iAccount || m_iLastClientHealth != m_iClientHealth || m_tmNextAccountHealthUpdate < gpGlobals->time))
+ m_tmNextAccountHealthUpdate = gpGlobals->time + 5.0f;
+
+ for (int playerIndex = 1; playerIndex <= gpGlobals->maxClients; playerIndex++)
{
- m_tmNextAccountHealthUpdate = gpGlobals->time + 5.0f;
+ CBaseEntity *pEntity = UTIL_PlayerByIndex(playerIndex);
- for (int playerIndex = 1; playerIndex <= gpGlobals->maxClients; playerIndex++)
- {
- CBaseEntity *pEntity = UTIL_PlayerByIndex(playerIndex);
+ if (!pEntity)
+ continue;
- if (!pEntity)
- continue;
-
- CBasePlayer *pPlayer = GetClassPtr((CBasePlayer *)pEntity->pev);
+ CBasePlayer *pPlayer = GetClassPtr((CBasePlayer *)pEntity->pev);
#ifdef REGAMEDLL_FIXES
- if (pPlayer->IsDormant())
- continue;
+ if (pPlayer->IsDormant())
+ continue;
#endif // REGAMEDLL_FIXES
- MESSAGE_BEGIN(MSG_ONE, gmsgHealthInfo, nullptr, pPlayer->edict());
- WRITE_BYTE(entindex());
- WRITE_LONG(ShouldToShowHealthInfo(pPlayer) ? m_iClientHealth : -1 /* means that 'HP' field will be hidden */);
- MESSAGE_END();
+ MESSAGE_BEGIN(MSG_ONE, gmsgHealthInfo, nullptr, pPlayer->edict());
+ WRITE_BYTE(entindex());
+ WRITE_LONG(ShouldToShowHealthInfo(pPlayer) ? m_iClientHealth : -1 /* means that 'HP' field will be hidden */);
+ MESSAGE_END();
- MESSAGE_BEGIN(MSG_ONE, gmsgAccount, nullptr, pPlayer->edict());
- WRITE_BYTE(entindex());
- WRITE_LONG(ShouldToShowAccount(pPlayer) ? m_iAccount : -1 /* means that this 'Money' will be hidden */);
- MESSAGE_END();
- }
-
- m_iLastAccount = m_iAccount;
- m_iLastClientHealth = m_iClientHealth;
+ MESSAGE_BEGIN(MSG_ONE, gmsgAccount, nullptr, pPlayer->edict());
+ WRITE_BYTE(entindex());
+ WRITE_LONG(ShouldToShowAccount(pPlayer) ? m_iAccount : -1 /* means that this 'Money' will be hidden */);
+ MESSAGE_END();
}
+
+ m_iLastAccount = m_iAccount;
+ m_iLastClientHealth = m_iClientHealth;
}
#endif // #ifdef BUILD_LATEST
}