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

Fix #132 You can no longer walk through rezzed players

Browse source 
--HG--
branch : compatibility
This commit is contained in:
kaetemi 2014-02-16 23:09:19 +01:00
parent f703359eaa
commit 4d3d7a000a
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
code/ryzom/client/src/character_cl.cpp
View file

@ -2291,6 +2291,21 @@ void CCharacterCL::endAnimTransition()
// If the next mode in the automaton != Current Mode // If the next mode in the automaton != Current Mode
if(_CurrentState->NextMode != _Mode) if(_CurrentState->NextMode != _Mode)
{ {
// Undo previous behaviour
switch(_Mode)
{
case MBEHAV::DEATH:
// Restore collisions.
if(_Primitive)
{
// TODO: Without this dynamic cast
if(dynamic_cast<CPlayerCL *>(this))
_Primitive->setOcclusionMask(MaskColPlayer);
else
_Primitive->setOcclusionMask(MaskColNpc);
}
break;
}
if(ClientCfg.UsePACSForAll && _Primitive) if(ClientCfg.UsePACSForAll && _Primitive)
_Primitive->setCollisionMask(MaskColNone); _Primitive->setCollisionMask(MaskColNone);
//// AJOUT //// //// AJOUT ////