Skip to content

Hotfix: OnHitConfirm #998

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
BenLubar merged 3 commits into from
Nov 6, 2025
Merged

Hotfix: OnHitConfirm #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4e102a
Fixes: Weapons and Aliens: Revised explosion and blood decals
Kitsune44 Nov 6, 2025
a650806
hotfix
Kitsune44 Nov 6, 2025
9a9f5ee
Merge branch 'ReactiveDrop:reactivedrop_beta' into hotfix
Kitsune44 Nov 6, 2025
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
2 changes: 1 addition & 1 deletion src/game/server/swarm/asw_barrel_explosive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ void CASW_Barrel_Explosive::DoExplosion()
vecForward = Vector( 0, 0, -1 );
VectorNormalize( vecForward );
trace_t tr;
UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );
UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );

if ( ( tr.m_pEnt != GetWorldEntity() ) || ( tr.hitbox != 0 ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/server/swarm/asw_firewall_piece.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ void CASW_Firewall_Piece::Spawn( void )

// scorch decals
trace_t tr2;
UTIL_TraceLine( tr.endpos + Vector( 0.0f, 0.0f, 32.0f ), tr.endpos + Vector( 0.0f, 0.0f, -60.0f ), MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, ASW_COLLISION_GROUP_IGNORE_NPCS, &tr2 );
UTIL_TraceLine( tr.endpos + Vector( 0.0f, 0.0f, 32.0f ), tr.endpos + Vector( 0.0f, 0.0f, -80.0f ), MASK_SHOT_HULL, this, ASW_COLLISION_GROUP_IGNORE_NPCS, &tr2 );
UTIL_DecalTrace( &tr2, "Scorch" );
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/game/server/swarm/asw_grenade_cluster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,12 @@ void CASW_Grenade_Cluster::DoExplosion()
//if (m_bMaster)
{
Vector vecForward = GetAbsVelocity();
float flTraceDist = 60.0f;
float flTraceDist = 80.0f;
if ( vecForward.LengthSqr() < 0.001f )
vecForward = Vector( 0, 0, -1 );
VectorNormalize( vecForward );
trace_t tr;
UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );
UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );

if ( ( tr.m_pEnt != GetWorldEntity() ) || ( tr.hitbox != 0 ) )
{
Expand Down
4 changes: 2 additions & 2 deletions src/game/server/swarm/asw_grenade_vindicator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,12 @@ void CASW_Grenade_Vindicator::Detonate()
if (m_bMaster)
{
Vector vecForward = GetAbsVelocity();
float flTraceDist = 60.0f;
float flTraceDist = 80.0f;
if ( vecForward.LengthSqr() < 0.001f )
vecForward = Vector( 0, 0, -1 );
VectorNormalize( vecForward );
trace_t tr;
UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );
UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );

if ( ( tr.m_pEnt != GetWorldEntity() ) || ( tr.hitbox != 0 ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/server/swarm/asw_laser_mine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ void CASW_Laser_Mine::Explode( bool bRemove )
{
// scorch decal
trace_t tr;
UTIL_TraceLine( GetAbsOrigin() + m_vecSurfaceNormal * 32.0f, GetAbsOrigin() - m_vecSurfaceNormal * 80.0f, MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );
UTIL_TraceLine( GetAbsOrigin() + m_vecSurfaceNormal * 32.0f, GetAbsOrigin() - m_vecSurfaceNormal * 80.0f, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );

if ( ( tr.m_pEnt != GetWorldEntity() ) || ( tr.hitbox != 0 ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/shared/swarm/asw_alien_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void CASW_Alien::DoBloodDecal( float flDamage, const Vector &vecPos, const Vecto
vecTraceDir.z += random->RandomFloat( -flNoise, flNoise );

// Don't bleed on grates.
UTIL_TraceLine( vecPos, vecPos + vecTraceDir * -flTraceDist, MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &Bloodtr);
UTIL_TraceLine( vecPos, vecPos + vecTraceDir * -flTraceDist, MASK_SHOT_HULL & ~CONTENTS_GRATE, this, COLLISION_GROUP_NONE, &Bloodtr);

if ( Bloodtr.fraction != 1.0 )
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/shared/swarm/rd_inventory_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3808,7 +3808,7 @@ namespace ReactiveDropInventory
if ( bKilled && pTarget && pTarget->IsInhabitableNPC() )
s_RD_Inventory_Manager.IncrementStrangePropertyOnEquippedItems( assert_cast<CASW_Inhabitable_NPC*>( pTarget ), 5007, 0, 0, false );

if ( !pAttacker && !pTarget )
if ( !pAttacker || !pTarget )
return;

if ( bKilled && pWeapon
Expand Down