Skip to content

Option to disable friendly fire warning on the crosshair #1773

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
AdamTadeusz merged 2 commits into from
Mar 8, 2026
Merged

Option to disable friendly fire warning on the crosshair #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c98bbc
init
AdamTadeusz Mar 2, 2026
1f06851
more readable
AdamTadeusz Mar 2, 2026
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
9 changes: 6 additions & 3 deletions src/game/client/hud_crosshair.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ ConVar cl_neo_crosshair_hip_fire("cl_neo_crosshair_hip_fire", "0", FCVAR_ARCHIVE
}
});
ConVar cl_neo_crosshair_scope_inaccuracy("cl_neo_crosshair_scope_inaccuracy", "1", FCVAR_ARCHIVE, "Show the player's inaccuracy when scoped", true, 0, true, 1);
ConVar cl_neo_crosshair_friendly_fire_warning("cl_neo_crosshair_friendly_fire_warning", "1", FCVAR_ARCHIVE, "Replace crosshair with friendly fire warning where applicable", true, 0, true, 1);
#endif

CHudCrosshair::CHudCrosshair( const char *pElementName ) :
Expand Down Expand Up @@ -532,13 +533,15 @@ void CHudCrosshair::Paint( void )
}
const int iXHairStyle = pCrosshairInfo->iStyle;

trace_t iffTrace;
if (NEORules()->GetGameType() != NEO_GAME_TYPE_DM)
bool showFriendlyFireCrosshair = false;
if (NEORules()->GetGameType() != NEO_GAME_TYPE_DM && cl_neo_crosshair_friendly_fire_warning.GetBool())
{
trace_t iffTrace;
CTraceFilterSimpleList iffTraceFilter(COLLISION_GROUP_NONE);
iffTraceFilter.AddEntityToIgnore(pPlayer);
constexpr int IFF_TRACELINE_LENGTH = 8192; // a little over 200m
UTIL_TraceLine(pPlayer->Weapon_ShootPosition(), pPlayer->Weapon_ShootPosition() + pPlayer->GetAutoaimVector(0) * IFF_TRACELINE_LENGTH, MASK_SHOT_HULL, &iffTraceFilter, &iffTrace);
showFriendlyFireCrosshair = IsPlayerIndex(iffTrace.GetEntityIndex()) && iffTrace.m_pEnt->GetTeamNumber() == pPlayer->GetTeamNumber();
}

if (bIsScopedWep && pPlayer->m_bInAim)
Expand Down Expand Up @@ -591,7 +594,7 @@ void CHudCrosshair::Paint( void )
}
}
}
else if (NEORules()->GetGameType() != NEO_GAME_TYPE_DM && IsPlayerIndex(iffTrace.GetEntityIndex()) && iffTrace.m_pEnt->GetTeamNumber() == pPlayer->GetTeamNumber())
else if (showFriendlyFireCrosshair)
{
vgui::surface()->DrawSetTexture(m_iTexIFFId);
int iTexWide, iTexTall;
Expand Down
3 changes: 3 additions & 0 deletions src/game/client/neo/ui/neo_root_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@ void NeoSettingsRestore(NeoSettings *ns, const NeoSettings::Keys::Flags flagsKey
pCrosshair->bNetworkCrosshair = cvr->cl_neo_crosshair_network.GetBool();
pCrosshair->bInaccuracyInScope = cvr->cl_neo_crosshair_scope_inaccuracy.GetBool();
pCrosshair->bHipFireCrosshair = cvr->cl_neo_crosshair_hip_fire.GetBool();
pCrosshair->bFriendlyFireWarning = cvr->cl_neo_crosshair_friendly_fire_warning.GetBool();
}
{
NeoSettings::HUD *pHUD = &ns->hud;
Expand Down Expand Up @@ -878,6 +879,7 @@ void NeoSettingsSave(const NeoSettings *ns)
cvr->cl_neo_crosshair_network.SetValue(pCrosshair->bNetworkCrosshair);
cvr->cl_neo_crosshair_scope_inaccuracy.SetValue(pCrosshair->bInaccuracyInScope);
cvr->cl_neo_crosshair_hip_fire.SetValue(pCrosshair->bHipFireCrosshair);
cvr->cl_neo_crosshair_friendly_fire_warning.SetValue(pCrosshair->bFriendlyFireWarning);
}
{
const NeoSettings::HUD *pHUD = &ns->hud;
Expand Down Expand Up @@ -1415,6 +1417,7 @@ void NeoSettings_Crosshair(NeoSettings *ns)
NeoUI::RingBoxBool(L"Show other players' crosshairs", &pCrosshair->bNetworkCrosshair);
NeoUI::RingBoxBool(L"Inaccuracy in scope", &pCrosshair->bInaccuracyInScope);
NeoUI::RingBoxBool(L"Hip fire crosshair", &pCrosshair->bHipFireCrosshair);
NeoUI::RingBoxBool(L"Friendly Fire warning", &pCrosshair->bFriendlyFireWarning);
}
NeoUI::EndSection();
}
Expand Down
2 changes: 2 additions & 0 deletions src/game/client/neo/ui/neo_root_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ struct NeoSettings
bool bNetworkCrosshair;
bool bInaccuracyInScope;
bool bHipFireCrosshair;
bool bFriendlyFireWarning;
bool bPreviewDynamicAccuracy;

// Textures
Expand Down Expand Up @@ -324,6 +325,7 @@ struct NeoSettings
CONVARREF_DEF(cl_neo_crosshair_network);
CONVARREF_DEF(cl_neo_crosshair_scope_inaccuracy);
CONVARREF_DEF(cl_neo_crosshair_hip_fire);
CONVARREF_DEF(cl_neo_crosshair_friendly_fire_warning);

// Friendly Markers
CONVARREF_DEFNOGLOBALPTR(cl_neo_squad_marker);
Expand Down