merge, fixed inconsistent newlines

This commit is contained in:
mattraykowski 2013-01-30 09:57:53 -06:00
commit 75f40c9e79
3 changed files with 32 additions and 32 deletions

View file

@ -197,7 +197,7 @@ void CAttachedFX::create(CCharacterCL &parent,
if (targeterInfo.StickMode.UserBoneName != 0)
{
CEntityCL *targeter = EntitiesMngr.entity(TargeterInfo.Slot);
if (targeter && targeter->skeleton())
if (parent.skeleton() && targeter && targeter->skeleton())
{
TargeterUserBoneID = parent.skeleton()->getBoneIdByName(NLMISC::CStringMapper::unmap(TargeterInfo.StickMode.UserBoneName));
}