Skip to content

Fix neo_npc_targetsystem crashing the game #1970

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
DESTROYGIRL merged 2 commits into from
May 24, 2026
Merged

Fix neo_npc_targetsystem crashing the game #1970

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9d89e1
initial
DESTROYGIRL May 21, 2026
3fe2a8b
tell it so
DESTROYGIRL May 21, 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
20 changes: 3 additions & 17 deletions src/game/shared/baseentity_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2111,19 +2111,6 @@ void CBaseEntity::FireBullets( const FireBulletsInfo_t &info )
}
#endif // NEO

#ifdef NEO
// The below penetration value check relies an all possible surfaces
// incurring a non-zero cost to m_flPenetration.
for (int i = 0; i < ARRAYSIZE(PENETRATION_RESISTANCE); ++i)
{
Assert(PENETRATION_RESISTANCE[i] > 0);
}
// Only draw tracers if we haven't yet penetrated, because the penetration logic is reentrant
// and would otherwise draw multiple tracers per shot.
Assert(neoWeapon);
if (neoWeapon->GetPenetration() == info.m_flPenetration)
{
#endif
if ( ( info.m_iTracerFreq != 0 ) && ( tracerCount++ % info.m_iTracerFreq ) == 0 && ( bHitGlass == false ) )
{
if ( bDoServerEffects == true )
Expand Down Expand Up @@ -2174,9 +2161,6 @@ void CBaseEntity::FireBullets( const FireBulletsInfo_t &info )
}
#endif
}
#ifdef NEO
}
#endif

//NOTENOTE: We could expand this to a more general solution for various material penetration types (wood, thin metal, etc)

Expand Down Expand Up @@ -2376,7 +2360,9 @@ void CBaseEntity::HandleShotPenetration(const FireBulletsInfo_t& info,
behindMaterialInfo.m_vecSpread = vec3_origin;
behindMaterialInfo.m_flDistance = info.m_flDistance * (1.0f - tr.fraction);
behindMaterialInfo.m_iAmmoType = info.m_iAmmoType;
behindMaterialInfo.m_iTracerFreq = info.m_iTracerFreq;
// Only draw tracers if we haven't yet penetrated, because the penetration logic is reentrant
// and would otherwise draw multiple tracers per shot.
behindMaterialInfo.m_iTracerFreq = 0;
behindMaterialInfo.m_flDamage = info.m_flDamage * Max(0.25f, (1.f - (penUsed / info.m_flPenetration)));
behindMaterialInfo.m_pAttacker = info.m_pAttacker ? info.m_pAttacker : this;
behindMaterialInfo.m_nFlags = info.m_nFlags;
Expand Down
Loading