TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit 7c67c2c326
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
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: { case RecoverState: {
if (mDataBlock->landSequenceTime > 0.0f) if (mDataBlock->landSequenceTime > 0.0f)
{ {
// Use the land sequence as the basis for the recovery PlayerData::ActionAnimation& anim = mDataBlock->actionList[PlayerData::LandAnim];
setActionThread(PlayerData::LandAnim, true, false, true, true); if (anim.sequence != -1)
F32 timeScale = mShapeInstance->getDuration(mActionAnimation.thread) / mDataBlock->landSequenceTime; {
mShapeInstance->setTimeScale(mActionAnimation.thread,timeScale); // 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; mRecoverDelay = mDataBlock->landSequenceTime;
} }
else else