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 #1803 from Azaezel/chasingElsey

Browse source 
clang: trailing else
This commit is contained in:
Areloch 2016-10-21 01:42:14 -05:00 committed by GitHub
parent 6cc7bcd2e0 5e1b6cbc48
commit 33f4ead242
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/T3D/fps/guiHealthBarHud.cpp
View file

@ -163,6 +163,7 @@ void GuiHealthBarHud::onRender(Point2I offset, const RectI &updateRect)
// Pulse the damage fill if it's below the threshold
if (mPulseRate != 0)
{
if (mValue < mPulseThreshold)
{
U32 time = Platform::getVirtualMilliseconds();
@ -171,7 +172,7 @@ void GuiHealthBarHud::onRender(Point2I offset, const RectI &updateRect)
}
else
mDamageFillColor.alpha = 1;
}
// Render damage fill %
RectI rect(updateRect);
if(getWidth() > getHeight())

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

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

2
Engine/source/sfx/sfxController.cpp
View file

@ -689,6 +689,7 @@ void SFXController::_play()
// Unpause sources, if we are paused.
if( mStatus == SFXStatusPaused )
{
for( U32 i = 0; i < mSources.size(); ++ i )
if( mSources[ i ].mPtr != NULL )
mSources[ i ].mPtr->play( 0.f ); // We want our fade values to take effect.
@ -697,6 +698,7 @@ void SFXController::_play()
mSources.erase( i );
-- i;
}
}
}
//-----------------------------------------------------------------------------