valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-09 11:31:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge c176360448 into 0565403b15

Browse source
This commit is contained in:
speedvoltage 2025-04-04 01:51:26 +02:00 committed by GitHub
commit bd8cd0b3c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/game/server/hl2/prop_combine_ball.cpp
View file

@ -1566,6 +1566,18 @@ void CPropCombineBall::VPhysicsCollision( int index, gamevcollisionevent_t *pEve
{
Vector preVelocity = pEvent->preVelocity[index];
float flSpeed = VectorNormalize( preVelocity );
CBaseEntity *pHitEntity = pEvent->pEntities[ !index ];
if ( FClassnameIs( pHitEntity, "npc_satchel" ) || // don't slow down on satchel charges
FClassnameIs( pHitEntity, "npc_grenade_frag" ) || // not on frag grenades either
StringHasPrefix( pHitEntity->GetClassname(), "weapon_" ) || // much less on weapons
StringHasPrefix( pHitEntity->GetClassname(), "item_" ) ) // the same for items
{
Vector vecBounceVelocity = -preVelocity;
vecBounceVelocity *= GetSpeed();
PhysCallbackSetVelocity( pEvent->pObjects[ index ], vecBounceVelocity );
return;
}
if ( m_nMaxBounces == -1 )
{
@ -1573,7 +1585,7 @@ void CPropCombineBall::VPhysicsCollision( int index, gamevcollisionevent_t *pEve
if( pHit->game.material != CHAR_TEX_FLESH || !hl2_episodic.GetBool() )
{
CBaseEntity *pHitEntity = pEvent->pEntities[!index];
if ( pHitEntity && IsHittableEntity( pHitEntity ) )
{
OnHitEntity( pHitEntity, flSpeed, index, pEvent );
@ -1610,7 +1622,6 @@ void CPropCombineBall::VPhysicsCollision( int index, gamevcollisionevent_t *pEve
vecFinalVelocity *= GetSpeed();
PhysCallbackSetVelocity( pEvent->pObjects[index], vecFinalVelocity );
CBaseEntity *pHitEntity = pEvent->pEntities[!index];
if ( pHitEntity && IsHittableEntity( pHitEntity ) )
{
OnHitEntity( pHitEntity, flSpeed, index, pEvent );