TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1003 from Azaezel/alpha41/safeLandings

Browse source 
address #96
This commit is contained in:
Brian Roberts 2023-04-01 10:55:49 -05:00 committed by GitHub
parent 5c8be2bea5 1fb4f57f6e
commit 7c67c2c326
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2269,10 +2269,14 @@ void Player::setState(ActionState state, U32 recoverTicks)
case RecoverState: {
if (mDataBlock->landSequenceTime > 0.0f)
{
// Use the land sequence as the basis for the recovery
setActionThread(PlayerData::LandAnim, true, false, true, true);
F32 timeScale = mShapeInstance->getDuration(mActionAnimation.thread) / mDataBlock->landSequenceTime;
mShapeInstance->setTimeScale(mActionAnimation.thread,timeScale);
PlayerData::ActionAnimation& anim = mDataBlock->actionList[PlayerData::LandAnim];
if (anim.sequence != -1)
{
// Use the land sequence as the basis for the recovery
setActionThread(PlayerData::LandAnim, true, false, true, true);
F32 timeScale = mShapeInstance->getDuration(mActionAnimation.thread) / mDataBlock->landSequenceTime;
mShapeInstance->setTimeScale(mActionAnimation.thread, timeScale);
}
mRecoverDelay = mDataBlock->landSequenceTime;
}
else