From fb280101f1ef7a26c98212d4fc5db1acd59deb37 Mon Sep 17 00:00:00 2001 From: Guillaume Dupuy Date: Sat, 17 Dec 2016 02:47:05 +0100 Subject: [PATCH 1/2] Fix a bug where a monster could be stuck after dropping aggro while rooted --HG-- branch : fix_freezing --- code/ryzom/server/src/ai_service/ai_bot_fauna.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/code/ryzom/server/src/ai_service/ai_bot_fauna.cpp b/code/ryzom/server/src/ai_service/ai_bot_fauna.cpp index 84bc47bf1..644496892 100644 --- a/code/ryzom/server/src/ai_service/ai_bot_fauna.cpp +++ b/code/ryzom/server/src/ai_service/ai_bot_fauna.cpp @@ -1070,6 +1070,7 @@ void CMovementMagnet::update(uint32 waitTime, uint32 ticksSinceLastUpdate, bool float distToDest=(float)_PathCont.getDestination().quickDistTo(_BotFauna.pos()); distToDest-=((_BotFauna.getPersistent().getChildIndex()&7)+1.5f); + _Speed=_BotFauna.walkSpeed(); float dist=_Speed*ticksSinceLastUpdate; CAIVector lastPos=_BotFauna.pos(); { From 73191a2388ff968d6306c4478e68691f0c7b7b0e Mon Sep 17 00:00:00 2001 From: Guillaume Dupuy Date: Sat, 17 Dec 2016 14:31:27 +0100 Subject: [PATCH 2/2] Remove duplicate code --HG-- branch : fix_freezing --- code/ryzom/server/src/ai_service/ai_bot_fauna.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/code/ryzom/server/src/ai_service/ai_bot_fauna.cpp b/code/ryzom/server/src/ai_service/ai_bot_fauna.cpp index 644496892..53afcd30a 100644 --- a/code/ryzom/server/src/ai_service/ai_bot_fauna.cpp +++ b/code/ryzom/server/src/ai_service/ai_bot_fauna.cpp @@ -1060,7 +1060,6 @@ void CMovementMagnet::update(uint32 waitTime, uint32 ticksSinceLastUpdate, bool BeginMove: _State=Movement_Move; getNewDestination (_BotFauna.wpos(), _denyFlags); // drop through to Move - _Speed=_BotFauna.walkSpeed(); case Movement_Move: {