Skip to content

Allow observe for dying player with EF_NODRAW effect #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wopox1337 merged 2 commits into from
Jun 20, 2021
Merged

Allow observe for dying player with EF_NODRAW effect #647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a390cad
Observer_IsValidTarget: checks refactoring
wopox1337 Jun 20, 2021
55b996c
Allow observe for dying player with EF_NODRAW effect
wopox1337 Jun 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions regamedll/dlls/observer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,19 @@ CBasePlayer *CBasePlayer::__API_HOOK(Observer_IsValidTarget)(int iPlayerIndex, b
CBasePlayer *pPlayer = UTIL_PlayerByIndex(iPlayerIndex);

// Don't spec observers or players who haven't picked a class yet
if (!pPlayer || pPlayer == this || pPlayer->has_disconnected || pPlayer->GetObserverMode() != OBS_NONE || (pPlayer->pev->effects & EF_NODRAW) || pPlayer->m_iTeam == UNASSIGNED || (bSameTeam && pPlayer->m_iTeam != m_iTeam))
if (!pPlayer || pPlayer == this)
return nullptr;

if (pPlayer->has_disconnected)
return nullptr;

if (pPlayer->GetObserverMode() != OBS_NONE)
return nullptr;

if (pPlayer->pev->effects & EF_NODRAW)
return nullptr;

if (pPlayer->m_iTeam == UNASSIGNED || (bSameTeam && pPlayer->m_iTeam != m_iTeam))
return nullptr;

return pPlayer;
Expand Down Expand Up @@ -269,12 +281,21 @@ void CBasePlayer::Observer_CheckTarget()
CBasePlayer *target = UTIL_PlayerByIndex(m_hObserverTarget->entindex());

// check taget
if (!target || target->pev->deadflag == DEAD_RESPAWNABLE || (target->pev->effects & EF_NODRAW))
if (!target || target->pev->deadflag == DEAD_RESPAWNABLE)
{
Observer_FindNextPlayer(false);

}
else if (target->pev->effects & EF_NODRAW)
{
#ifdef REGAMEDLL_FIXES
bool bStillDying = (target->pev->deadflag == DEAD_DYING || (target->pev->deadflag == DEAD_DEAD && (gpGlobals->time <= target->m_fDeadTime + 2.0f)));
if (!bStillDying || (target->m_afPhysicsFlags & PFLAG_OBSERVER)) // keep observing to victim until dying, even if it is invisible
#endif
Observer_FindNextPlayer(false);
}
else if (target->pev->deadflag == DEAD_DEAD && gpGlobals->time > target->m_fDeadTime + 2.0f)
{
// 3 secs after death change target
// 2 secs after death change target
Observer_FindNextPlayer(false);

if (!m_hObserverTarget)
Expand Down
⚡