mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-14 08:04:40 +00:00
Merge pull request #1356 from Azaezel/development
handle pathshapes comming in from above players more gracefully
This commit is contained in:
commit
221614383b
1 changed files with 3 additions and 0 deletions
|
|
@ -4771,6 +4771,9 @@ void Player::updateAttachment(){
|
||||||
Point3F(pos.x, pos.y, pos.z - 1.0f ),
|
Point3F(pos.x, pos.y, pos.z - 1.0f ),
|
||||||
PathShapeObjectType, &rInfo))
|
PathShapeObjectType, &rInfo))
|
||||||
{
|
{
|
||||||
|
if ((mJumpSurfaceLastContact < JumpSkipContactsMax) && !mSwimming)
|
||||||
|
setPosition(rInfo.point, getRotation());
|
||||||
|
|
||||||
if( rInfo.object->getTypeMask() & PathShapeObjectType) //Ramen
|
if( rInfo.object->getTypeMask() & PathShapeObjectType) //Ramen
|
||||||
{
|
{
|
||||||
if (getParent() == NULL)
|
if (getParent() == NULL)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue