TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'upstream/development' into STBImageLoading-PR

Browse source
This commit is contained in:
marauder2k7 2024-01-23 08:48:12 +00:00
commit e6554e9abc
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Engine/source/T3D/player.cpp
View file

@ -5075,8 +5075,12 @@ F32 Player::_doCollisionImpact( const Collision *collision, bool fallingCollisio
if ( ((bd > mDataBlock->minImpactSpeed && fallingCollision) || bd > mDataBlock->minLateralImpactSpeed)
&& !mMountPending )
{
if ( !isGhost() )
onImpact( collision->object, collision->normal * bd );
if (!isGhost())
{
onImpact(collision->object, collision->normal * bd);
mImpactSound = PlayerData::ImpactNormal;
setMaskBits(ImpactMask);
}
if (mDamageState == Enabled && mState != RecoverState)
{
@ -5101,13 +5105,6 @@ F32 Player::_doCollisionImpact( const Collision *collision, bool fallingCollisio
}
}
if ( isServerObject() &&
(bd > (mDataBlock->minImpactSpeed / 3.0f) || bd > (mDataBlock->minLateralImpactSpeed / 3.0f )) )
{
mImpactSound = PlayerData::ImpactNormal;
setMaskBits(ImpactMask);
}
return bd;
}