Skip to content

Don't show ghost indicator on compass when spectating carrier. #1420

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
Agiel merged 1 commit into from
Oct 14, 2025
Merged

Don't show ghost indicator on compass when spectating carrier. #1420

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
11 changes: 5 additions & 6 deletions src/game/client/neo/ui/neo_hud_compass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,21 @@ static float safeAngle(float angle) {

void CNEOHud_Compass::UpdateStateForNeoHudElementDraw()
{
auto pLocalPlayer = C_NEO_Player::GetLocalNEOPlayer();
Assert(pLocalPlayer);
auto pFPPlayer = GetFirstPersonPlayer();
Assert(pFPPlayer);

// Point the objective arrow to the ghost, if it exists
if (NEORules()->GhostExists() || NEORules()->JuggernautItemExists())
{
const Vector objPos = NEORules()->GetGameType() == NEO_GAME_TYPE_JGR ? NEORules()->GetJuggernautMarkerPos() : NEORules()->GetGhostPos();
const Vector objVec = objPos - pLocalPlayer->EyePosition();
const Vector objVec = objPos - pFPPlayer->EyePosition();
const float objYaw = RAD2DEG(atan2f(objVec.y, objVec.x));
float objAngle = safeAngle(- objYaw + pLocalPlayer->EyeAngles()[YAW]);
float objAngle = safeAngle(- objYaw + pFPPlayer->EyeAngles()[YAW]);
m_objAngle = Clamp(objAngle, -(float)m_fov / 2, (float)m_fov / 2);
}

if (cl_neo_hud_rangefinder_enabled.GetBool())
{
C_NEO_Player *pFPPlayer = GetFirstPersonPlayer();
if (pFPPlayer->IsInAim())
{
// Update Rangefinder
Expand Down Expand Up @@ -174,7 +173,7 @@ void CNEOHud_Compass::DrawCompass() const
L"S", L"|", L"SW", L"|", L"W", L"|", L"NW", L"|", L"N", L"|", L"NE", L"|", L"E", L"|", L"SE", L"|",
};

auto player = C_NEO_Player::GetLocalNEOPlayer();
auto player = GetFirstPersonPlayer();
Assert(player);

surface()->DrawSetTextFont(m_hFont);
Expand Down