Move beta features to release stage.

This commit is contained in:
s1lent 2019-12-17 21:25:24 +07:00
parent 3b612dc857
commit dd6141eae7
No known key found for this signature in database
GPG Key ID: 0FE401DC73916B5C
6 changed files with 37 additions and 51 deletions

View File

@ -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.<br/>`0` disallow<br/>`1` allow<br/>`NOTE`: Potentially dangerous for untrusted maps. | | mp_allow_point_servercommand | 0 | 0 | 1 | Allow use of point_servercommand entities in map.<br/>`0` disallow<br/>`1` allow<br/>`NOTE`: Potentially dangerous for untrusted maps. |
| mp_hullbounds_sets | 1 | 0 | 1 | Sets mins/maxs hull bounds for the player.<br/>`0` disabled<br/>`1` enabled | | mp_hullbounds_sets | 1 | 0 | 1 | Sets mins/maxs hull bounds for the player.<br/>`0` disabled<br/>`1` enabled |
| mp_unduck_method | 0 | 0 | 1 | Don't unduck if ducking isn't finished yet.<br/>`0` disabled<br/>`1` enabled<br/>`NOTE`: This also prevents double duck. | | mp_unduck_method | 0 | 0 | 1 | Don't unduck if ducking isn't finished yet.<br/>`0` disabled<br/>`1` enabled<br/>`NOTE`: This also prevents double duck. |
| mp_scoreboard_showhealth | 3 | 0 | 5 | Show `HP` field into a scoreboard.<br/>`0` don't send any update for `HP` field to any clients<br/>`1` show only Terrorist `HP` field to all clients<br/>`2` show only CT `HP` field to all clients<br/>`3` show `HP` field to teammates<br/>`4` show `HP` field to all clients<br/>`5` show `HP` field to teammates and spectators<br/><br/>`Note this CVar are work in beta only.` | | mp_scoreboard_showhealth | 3 | 0 | 5 | Show `HP` field into a scoreboard.<br/>`0` don't send any update for `HP` field to any clients<br/>`1` show only Terrorist `HP` field to all clients<br/>`2` show only CT `HP` field to all clients<br/>`3` show `HP` field to teammates<br/>`4` show `HP` field to all clients<br/>`5` show `HP` field to teammates and spectators |
| mp_scoreboard_showmoney | 3 | 0 | 5 | Show `Money` field into a scoreboard.<br/>`0` don't send any update for `Money` field to any clients<br/>`1` show only Terrorist `Money` field to all clients<br/>`2` show only CT `Money` field to all clients<br/>`3` show `Money` field to teammates<br/>`4` show `Money` field to all clients<br/>`5` show `Money` field to teammates and spectators<br/><br/>`Note this CVar are work in beta only.` | | mp_scoreboard_showmoney | 3 | 0 | 5 | Show `Money` field into a scoreboard.<br/>`0` don't send any update for `Money` field to any clients<br/>`1` show only Terrorist `Money` field to all clients<br/>`2` show only CT `Money` field to all clients<br/>`3` show `Money` field to teammates<br/>`4` show `Money` field to all clients<br/>`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.<br/> Range is from `0` - `1` (with 1 being damage equal to what is done to an enemy) | | ff_damage_reduction_bullets | 0.35 | 0.0 | 1.0 | How much to reduce damage done to teammates when shot.<br/> 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.<br/> 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.<br/> 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.<br/> 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.<br/> Range is from `0` - `1` (with 1 being damage equal to what is done to an enemy) |

2
dist/game.cfg vendored
View File

@ -259,7 +259,6 @@ mp_allow_point_servercommand 0
// 3 - show 'HP' field to teammates // 3 - show 'HP' field to teammates
// 4 - show 'HP' field to all clients // 4 - show 'HP' field to all clients
// 5 - show 'HP' field to teammates and spectators // 5 - show 'HP' field to teammates and spectators
// Note this CVar are work in beta only.
// //
// Default value: "3" // Default value: "3"
mp_scoreboard_showhealth 3 mp_scoreboard_showhealth 3
@ -271,7 +270,6 @@ mp_scoreboard_showhealth 3
// 3 - show 'Money' field to teammates // 3 - show 'Money' field to teammates
// 4 - show 'Money' field to all clients // 4 - show 'Money' field to all clients
// 5 - show 'Money' field to teammates and spectators // 5 - show 'Money' field to teammates and spectators
// Note this CVar are work in beta only.
// //
// Default value: "3" // Default value: "3"
mp_scoreboard_showmoney 3 mp_scoreboard_showmoney 3

View File

@ -225,11 +225,8 @@ void LinkUserMessages()
gmsgHudTextArgs = REG_USER_MSG("HudTextArgs", -1); gmsgHudTextArgs = REG_USER_MSG("HudTextArgs", -1);
#ifdef BUILD_LATEST #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 #endif
} }

View File

@ -251,11 +251,8 @@ void EXT_FUNC GameDLLInit()
CVAR_REGISTER(&humans_join_team); CVAR_REGISTER(&humans_join_team);
#ifdef BUILD_LATEST #ifdef BUILD_LATEST
if (AreRunningBeta()) CVAR_REGISTER(&scoreboard_showhealth);
{ CVAR_REGISTER(&scoreboard_showmoney);
CVAR_REGISTER(&scoreboard_showhealth);
CVAR_REGISTER(&scoreboard_showmoney);
}
#endif #endif
// Remove unused cvars // Remove unused cvars

View File

@ -3426,18 +3426,15 @@ void CHalfLifeMultiplay::InitHUD(CBasePlayer *pl)
} }
#ifdef BUILD_LATEST #ifdef BUILD_LATEST
if (AreRunningBeta()) MESSAGE_BEGIN(MSG_ONE, gmsgHealthInfo, nullptr, pl->edict());
{ WRITE_BYTE(plr->entindex());
MESSAGE_BEGIN(MSG_ONE, gmsgHealthInfo, nullptr, pl->edict()); WRITE_LONG(plr->ShouldToShowHealthInfo(pl) ? plr->m_iClientHealth : -1 /* means that 'HP' field will be hidden */);
WRITE_BYTE(plr->entindex()); MESSAGE_END();
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()); MESSAGE_BEGIN(MSG_ONE, gmsgAccount, nullptr, pl->edict());
WRITE_BYTE(plr->entindex()); WRITE_BYTE(plr->entindex());
WRITE_LONG(plr->ShouldToShowAccount(pl) ? plr->m_iAccount : -1 /* means that this 'Money' will be hidden */); WRITE_LONG(plr->ShouldToShowAccount(pl) ? plr->m_iAccount : -1 /* means that this 'Money' will be hidden */);
MESSAGE_END(); MESSAGE_END();
}
#endif // BUILD_LATEST #endif // BUILD_LATEST
} }

View File

@ -5183,7 +5183,7 @@ void CBasePlayer::SetScoreAttrib(CBasePlayer *dest)
state |= SCORE_STATUS_VIP; state |= SCORE_STATUS_VIP;
#ifdef BUILD_LATEST #ifdef BUILD_LATEST
if (AreRunningBeta() && m_bHasDefuser) if (m_bHasDefuser)
state |= SCORE_STATUS_DEFKIT; state |= SCORE_STATUS_DEFKIT;
#endif #endif
@ -7206,41 +7206,38 @@ void EXT_FUNC CBasePlayer::__API_HOOK(UpdateClientData)()
} }
#ifdef BUILD_LATEST #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_tmNextAccountHealthUpdate = gpGlobals->time + 5.0f;
(m_iLastAccount != m_iAccount || m_iLastClientHealth != m_iClientHealth || m_tmNextAccountHealthUpdate < gpGlobals->time))
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++) if (!pEntity)
{ continue;
CBaseEntity *pEntity = UTIL_PlayerByIndex(playerIndex);
if (!pEntity) CBasePlayer *pPlayer = GetClassPtr<CCSPlayer>((CBasePlayer *)pEntity->pev);
continue;
CBasePlayer *pPlayer = GetClassPtr<CCSPlayer>((CBasePlayer *)pEntity->pev);
#ifdef REGAMEDLL_FIXES #ifdef REGAMEDLL_FIXES
if (pPlayer->IsDormant()) if (pPlayer->IsDormant())
continue; continue;
#endif // REGAMEDLL_FIXES #endif // REGAMEDLL_FIXES
MESSAGE_BEGIN(MSG_ONE, gmsgHealthInfo, nullptr, pPlayer->edict()); MESSAGE_BEGIN(MSG_ONE, gmsgHealthInfo, nullptr, pPlayer->edict());
WRITE_BYTE(entindex()); WRITE_BYTE(entindex());
WRITE_LONG(ShouldToShowHealthInfo(pPlayer) ? m_iClientHealth : -1 /* means that 'HP' field will be hidden */); WRITE_LONG(ShouldToShowHealthInfo(pPlayer) ? m_iClientHealth : -1 /* means that 'HP' field will be hidden */);
MESSAGE_END(); MESSAGE_END();
MESSAGE_BEGIN(MSG_ONE, gmsgAccount, nullptr, pPlayer->edict()); MESSAGE_BEGIN(MSG_ONE, gmsgAccount, nullptr, pPlayer->edict());
WRITE_BYTE(entindex()); WRITE_BYTE(entindex());
WRITE_LONG(ShouldToShowAccount(pPlayer) ? m_iAccount : -1 /* means that this 'Money' will be hidden */); WRITE_LONG(ShouldToShowAccount(pPlayer) ? m_iAccount : -1 /* means that this 'Money' will be hidden */);
MESSAGE_END(); MESSAGE_END();
}
m_iLastAccount = m_iAccount;
m_iLastClientHealth = m_iClientHealth;
} }
m_iLastAccount = m_iAccount;
m_iLastClientHealth = m_iClientHealth;
} }
#endif // #ifdef BUILD_LATEST #endif // #ifdef BUILD_LATEST
} }