Skip to content

Use spectate target vision mode in first person only #1104

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
brysondev merged 1 commit into from
May 15, 2025
Merged

Use spectate target vision mode in first person only #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/game/client/c_baseanimating.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3238,9 +3238,9 @@ int C_BaseAnimating::DrawModel( int flags )
}

#ifdef GLOWS_ENABLE
auto pTargetPlayer = glow_outline_effect_enable.GetBool() ? C_NEO_Player::GetLocalNEOPlayer() : C_NEO_Player::GetTargetNEOPlayer();
auto pTargetPlayer = glow_outline_effect_enable.GetBool() ? C_NEO_Player::GetLocalNEOPlayer() : C_NEO_Player::GetVisionTargetNEOPlayer();
#else
auto pTargetPlayer = C_NEO_Player::GetTargetNEOPlayer();
auto pTargetPlayer = C_NEO_Player::GetVisionTargetNEOPlayer();
#endif // GLOWS_ENABLE

const bool inMotionVision = pTargetPlayer->IsInVision() && pTargetPlayer->GetClass() == NEO_CLASS_ASSAULT;
Expand Down
2 changes: 1 addition & 1 deletion src/game/client/neo/c_neo_npc_dummy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ int C_NEO_NPCDummy::DrawModel(int flags) // From c_neo_player
return BaseClass::DrawModel(flags);
}

auto pTargetPlayer = C_NEO_Player::GetTargetNEOPlayer();
auto pTargetPlayer = C_NEO_Player::GetVisionTargetNEOPlayer();
if (!pTargetPlayer)
{
Assert(false);
Expand Down
4 changes: 2 additions & 2 deletions src/game/client/neo/c_neo_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,9 +717,9 @@ int C_NEO_Player::DrawModel(int flags)
}

#ifdef GLOWS_ENABLE
auto pTargetPlayer = glow_outline_effect_enable.GetBool() ? C_NEO_Player::GetLocalNEOPlayer() : C_NEO_Player::GetTargetNEOPlayer();
auto pTargetPlayer = glow_outline_effect_enable.GetBool() ? C_NEO_Player::GetLocalNEOPlayer() : C_NEO_Player::GetVisionTargetNEOPlayer();
#else
auto pTargetPlayer = C_NEO_Player::GetTargetNEOPlayer();
auto pTargetPlayer = C_NEO_Player::GetVisionTargetNEOPlayer();
#endif // GLOWS_ENABLE
if (!pTargetPlayer)
{
Expand Down
6 changes: 3 additions & 3 deletions src/game/client/neo/c_neo_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ class C_NEO_Player : public C_HL2MP_Player
virtual ~C_NEO_Player();

static C_NEO_Player *GetLocalNEOPlayer() { return static_cast<C_NEO_Player*>(C_BasePlayer::GetLocalPlayer()); }
static C_NEO_Player *GetTargetNEOPlayer()
{ // Returns the player we are spectating, or local player if not spectating anyone
static C_NEO_Player *GetVisionTargetNEOPlayer()
{ // Returns the player we are spectating if in first person mode, or local player
auto localNeoPlayer = GetLocalNEOPlayer();
if (localNeoPlayer->IsObserver())
if (localNeoPlayer->IsObserver() && localNeoPlayer->m_iObserverMode == OBS_MODE_IN_EYE)
{ // NEOTOD (Adam) clear m_hObserverTarget instead when exiting observer mode?
auto targetNeoPlayer = static_cast<C_NEO_Player*>(localNeoPlayer->GetObserverTarget());
if (targetNeoPlayer) { return targetNeoPlayer; }
Expand Down
4 changes: 2 additions & 2 deletions src/game/client/viewpostprocess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2949,9 +2949,9 @@ void DoEnginePostProcessing( int x, int y, int w, int h, bool bFlashlightIsOn, b
else
{
#ifdef GLOWS_ENABLE
auto pTargetPlayer = glow_outline_effect_enable.GetBool() ? C_NEO_Player::GetLocalNEOPlayer() : C_NEO_Player::GetTargetNEOPlayer();
auto pTargetPlayer = glow_outline_effect_enable.GetBool() ? C_NEO_Player::GetLocalNEOPlayer() : C_NEO_Player::GetVisionTargetNEOPlayer();
#else
auto pTargetPlayer = C_NEO_Player::GetTargetNEOPlayer();
auto pTargetPlayer = C_NEO_Player::GetVisionTargetNEOPlayer();
#endif // GLOWS_ENABLE
if (pTargetPlayer && pTargetPlayer->IsInVision())
{
Expand Down
4 changes: 2 additions & 2 deletions src/game/shared/neo/weapons/weapon_neobasecombatweapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,9 +1128,9 @@ extern ConVar glow_outline_effect_enable;
int CNEOBaseCombatWeapon::DrawModel(int flags)
{
#ifdef GLOWS_ENABLE
auto pTargetPlayer = glow_outline_effect_enable.GetBool() ? C_NEO_Player::GetLocalNEOPlayer() : C_NEO_Player::GetTargetNEOPlayer();
auto pTargetPlayer = glow_outline_effect_enable.GetBool() ? C_NEO_Player::GetLocalNEOPlayer() : C_NEO_Player::GetVisionTargetNEOPlayer();
#else
auto pTargetPlayer = C_NEO_Player::GetTargetNEOPlayer();
auto pTargetPlayer = C_NEO_Player::GetVisionTargetNEOPlayer();
#endif // GLOWS_ENABLE
if (!pTargetPlayer)
{
Expand Down