Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

merge, fixed inconsistent newlines

Browse source
This commit is contained in:
mattraykowski 2013-01-30 09:57:53 -06:00
commit 98b4989f3f
3 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/client/src/attached_fx.cpp
View file

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