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

clang: trailing else

Browse source
This commit is contained in:
Azaezel 2016-10-18 08:58:15 -05:00
parent d30dedd7c5
commit 5e1b6cbc48
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3835,11 +3835,13 @@ void Player::updateActionThread()
// Select an action animation sequence, this assumes that // Select an action animation sequence, this assumes that
// this function is called once per tick. // this function is called once per tick.
if(mActionAnimation.action != PlayerData::NullAnimation) if(mActionAnimation.action != PlayerData::NullAnimation)
{
if (mActionAnimation.forward) if (mActionAnimation.forward)
mActionAnimation.atEnd = mShapeInstance->getPos(mActionAnimation.thread) == 1; mActionAnimation.atEnd = mShapeInstance->getPos(mActionAnimation.thread) == 1;
else else
mActionAnimation.atEnd = mShapeInstance->getPos(mActionAnimation.thread) == 0; mActionAnimation.atEnd = mShapeInstance->getPos(mActionAnimation.thread) == 0;
}
// Only need to deal with triggers on the client // Only need to deal with triggers on the client
if( isGhost() ) if( isGhost() )
{ {
@ -4581,6 +4583,7 @@ void Player::updateAnimationTree(bool firstPerson)
{ {
S32 mode = 0; S32 mode = 0;
if (firstPerson) if (firstPerson)
{
if (mActionAnimation.firstPerson) if (mActionAnimation.firstPerson)
mode = 0; mode = 0;
// TSShapeInstance::MaskNodeRotation; // TSShapeInstance::MaskNodeRotation;
@ -4588,7 +4591,7 @@ void Player::updateAnimationTree(bool firstPerson)
// TSShapeInstance::MaskNodePosY; // TSShapeInstance::MaskNodePosY;
else else
mode = TSShapeInstance::MaskNodeAllButBlend; mode = TSShapeInstance::MaskNodeAllButBlend;
}
for (U32 i = 0; i < PlayerData::NumSpineNodes; i++) for (U32 i = 0; i < PlayerData::NumSpineNodes; i++)
if (mDataBlock->spineNode[i] != -1) if (mDataBlock->spineNode[i] != -1)
mShapeInstance->setNodeAnimationState(mDataBlock->spineNode[i],mode); mShapeInstance->setNodeAnimationState(mDataBlock->spineNode[i],mode);