diff --git a/Engine/source/T3D/player.cpp b/Engine/source/T3D/player.cpp index 5a30fb77b..241be2c2f 100644 --- a/Engine/source/T3D/player.cpp +++ b/Engine/source/T3D/player.cpp @@ -356,6 +356,7 @@ PlayerData::PlayerData() decalID = 0; decalOffset = 0.0f; + actionCount = 0; lookAction = 0; // size of bounding box @@ -3691,7 +3692,7 @@ bool Player::setActionThread(const char* sequence,bool hold,bool wait,bool fsp) void Player::setActionThread(U32 action,bool forward,bool hold,bool wait,bool fsp, bool forceSet) { - if (!mDataBlock || (mActionAnimation.action == action && mActionAnimation.forward == forward && !forceSet)) + if (!mDataBlock || !mDataBlock->actionCount || (mActionAnimation.action == action && mActionAnimation.forward == forward && !forceSet)) return; if (action >= PlayerData::NumActionAnims)