Skip to content

Fix throwables bouncing off brush entities instead of exploding #1745

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

Open
Ashetf2 wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −3
Open

Fix throwables bouncing off brush entities instead of exploding #1745

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
6 changes: 3 additions & 3 deletions src/game/shared/tf/tf_weapon_jar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,9 +593,9 @@ void CTFProjectile_Jar::VPhysicsCollision( int index, gamevcollisionevent_t *pEv
OnHitWorld();
}

// Break if we hit the world.
bool bIsDynamicProp = ( NULL != dynamic_cast<CDynamicProp *>( pHitEntity ) );
if ( ExplodesOnHit() && pHitEntity && ( pHitEntity->IsWorld() || bIsDynamicProp ) )
// Break if we hit anything that isn't a player (the world, doors, etc).
// bool bIsDynamicProp = ( NULL != dynamic_cast<CDynamicProp *>( pHitEntity ) );
if ( ExplodesOnHit() && pHitEntity && ( !pHitEntity->IsPlayer() ) )
{
// Explode immediately next frame. (Can't explode in the collision callback.)
m_vCollisionVelocity = pEvent->preVelocity[index];
Expand Down