reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2025-06-14 23:02:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow observe for dying player with EF_NODRAW effect (#647)

Browse Source 
* Observer_IsValidTarget: checks refactoring
This commit is contained in:
Sergey Shorokhov 2021-06-20 14:44:06 +03:00 committed by GitHub
commit 59c297d26d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
regamedll/dlls/observer.cpp
View File

@ -29,7 +29,19 @@ CBasePlayer *CBasePlayer::__API_HOOK(Observer_IsValidTarget)(int iPlayerIndex, b
CBasePlayer *pPlayer = UTIL_PlayerByIndex(iPlayerIndex); CBasePlayer *pPlayer = UTIL_PlayerByIndex(iPlayerIndex);
// Don't spec observers or players who haven't picked a class yet // 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 nullptr;
return pPlayer; return pPlayer;
@ -269,12 +281,21 @@ void CBasePlayer::Observer_CheckTarget()
CBasePlayer *target = UTIL_PlayerByIndex(m_hObserverTarget->entindex()); CBasePlayer *target = UTIL_PlayerByIndex(m_hObserverTarget->entindex());
// check taget // check taget
if (!target || target->pev->deadflag == DEAD_RESPAWNABLE || (target->pev->effects & EF_NODRAW)) if (!target || target->pev->deadflag == DEAD_RESPAWNABLE)
{
Observer_FindNextPlayer(false); 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) 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); Observer_FindNextPlayer(false);
if (!m_hObserverTarget) if (!m_hObserverTarget)