Merged in Glorf/ryzomcore/fix_freezing (pull request #143)
Fix a bug where a monster could be stuck after dropping aggro while rooted --HG-- branch : compatibility-develop
This commit is contained in:
commit
0c830e00e1
1 changed files with 1 additions and 1 deletions
|
@ -1060,7 +1060,6 @@ void CMovementMagnet::update(uint32 waitTime, uint32 ticksSinceLastUpdate, bool
|
||||||
BeginMove:
|
BeginMove:
|
||||||
_State=Movement_Move;
|
_State=Movement_Move;
|
||||||
getNewDestination (_BotFauna.wpos(), _denyFlags); // drop through to Move
|
getNewDestination (_BotFauna.wpos(), _denyFlags); // drop through to Move
|
||||||
_Speed=_BotFauna.walkSpeed();
|
|
||||||
|
|
||||||
case Movement_Move:
|
case Movement_Move:
|
||||||
{
|
{
|
||||||
|
@ -1070,6 +1069,7 @@ void CMovementMagnet::update(uint32 waitTime, uint32 ticksSinceLastUpdate, bool
|
||||||
float distToDest=(float)_PathCont.getDestination().quickDistTo(_BotFauna.pos());
|
float distToDest=(float)_PathCont.getDestination().quickDistTo(_BotFauna.pos());
|
||||||
distToDest-=((_BotFauna.getPersistent().getChildIndex()&7)+1.5f);
|
distToDest-=((_BotFauna.getPersistent().getChildIndex()&7)+1.5f);
|
||||||
|
|
||||||
|
_Speed=_BotFauna.walkSpeed();
|
||||||
float dist=_Speed*ticksSinceLastUpdate;
|
float dist=_Speed*ticksSinceLastUpdate;
|
||||||
CAIVector lastPos=_BotFauna.pos();
|
CAIVector lastPos=_BotFauna.pos();
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue