Allow observe for dying player with EF_NODRAW effect

s1lentq · Jun 19, 2021 · e7aeab5 · e7aeab5
1 parent a9111f8
commit e7aeab5
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/regamedll/dlls/observer.cpp b/regamedll/dlls/observer.cpp
@@ -29,7 +29,23 @@ 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->m_iTeam == UNASSIGNED || (bSameTeam && pPlayer->m_iTeam != m_iTeam))
+ return nullptr;
+
+ if (pPlayer->GetObserverMode() != OBS_NONE)
+ return nullptr;
+
+ if (pPlayer->pev->effects & EF_NODRAW
+#ifdef REGAMEDLL_FIXES
+ && (pPlayer->pev->deadflag == DEAD_DEAD || pPlayer->pev->deadflag == DEAD_NO)
+#endif
+ )
  return nullptr;
 
  return pPlayer;