reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-12-27 07:05:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

StatusText: Don't show hp on ffa mode (#431)

Browse Source 
* StatusText: Don't show hp on ffa mode
* same fixes for new features (scoreboard show money/health)
This commit is contained in:
Vaqtincha 2019-10-09 15:09:23 +05:00 committed by Dmitry Novikov
parent 46624d95b8
commit e80a766870
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
regamedll/dlls/player.cpp
View File

@ -7237,13 +7237,13 @@ bool CBasePlayer::ShouldToShowAccount(CBasePlayer *pReceiver) const
switch (iShowAccount) switch (iShowAccount)
{ {
// show field to teammates // show field to teammates
case 3: return pReceiver->m_iTeam == m_iTeam; case 3: return !CSGameRules()->IsFreeForAll() && pReceiver->m_iTeam == m_iTeam;
// show field to all clients // show field to all clients
case 4: return true; case 4: return true;
// show field to teammates and spectators // show field to teammates and spectators
case 5: return (pReceiver->m_iTeam == m_iTeam || pReceiver->m_iTeam == SPECTATOR); case 5: return ((!CSGameRules()->IsFreeForAll() && pReceiver->m_iTeam == m_iTeam) || pReceiver->m_iTeam == SPECTATOR);
default: default:
break; break;
} }
@ -7269,13 +7269,13 @@ bool CBasePlayer::ShouldToShowHealthInfo(CBasePlayer *pReceiver) const
switch (iShowHealth) switch (iShowHealth)
{ {
// show field to teammates // show field to teammates
case 3: return pReceiver->m_iTeam == m_iTeam; case 3: return !CSGameRules()->IsFreeForAll() && pReceiver->m_iTeam == m_iTeam;
// show field to all clients // show field to all clients
case 4: return true; case 4: return true;
// show field to teammates and spectators // show field to teammates and spectators
case 5: return (pReceiver->m_iTeam == m_iTeam || pReceiver->m_iTeam == SPECTATOR); case 5: return ((!CSGameRules()->IsFreeForAll() && pReceiver->m_iTeam == m_iTeam) || pReceiver->m_iTeam == SPECTATOR);
default: default:
break; break;
} }
@ -7517,10 +7517,12 @@ void CBasePlayer::UpdateStatusBar()
{ {
CBasePlayer *pTarget = (CBasePlayer *)pEntity; CBasePlayer *pTarget = (CBasePlayer *)pEntity;
newSBarState[SBAR_ID_TARGETNAME] = ENTINDEX(pTarget->edict()); bool sameTeam = !CSGameRules()->IsFreeForAll() && pTarget->m_iTeam == m_iTeam;
newSBarState[SBAR_ID_TARGETTYPE] = (pTarget->m_iTeam == m_iTeam) ? SBAR_TARGETTYPE_TEAMMATE : SBAR_TARGETTYPE_ENEMY;
if (pTarget->m_iTeam == m_iTeam || GetObserverMode() != OBS_NONE) newSBarState[SBAR_ID_TARGETNAME] = ENTINDEX(pTarget->edict());
newSBarState[SBAR_ID_TARGETTYPE] = sameTeam ? SBAR_TARGETTYPE_TEAMMATE : SBAR_TARGETTYPE_ENEMY;
if (sameTeam || GetObserverMode() != OBS_NONE)
{ {
if (playerid.value != PLAYERID_MODE_OFF || GetObserverMode() != OBS_NONE) if (playerid.value != PLAYERID_MODE_OFF || GetObserverMode() != OBS_NONE)
Q_strcpy(sbuf0, "1 %c1: %p2\n2 %h: %i3%%"); Q_strcpy(sbuf0, "1 %c1: %p2\n2 %h: %i3%%");