mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-24 00:39:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'iseeyou' into 'master'

Browse Source 
Prevent fleeing in inappropriate situations (bug #6932)

Closes #6932

See merge request OpenMW/openmw!3508
This commit is contained in:
psi29a 2023-10-26 16:24:10 +00:00
commit 664caa2fc1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -33,6 +33,7 @@
Bug #6807: Ultimate Galleon is not working properly
Bug #6893: Lua: Inconsistent behavior with actors affected by Disable and SetDelete commands
Bug #6894: Added item combines with equipped stack instead of creating a new unequipped stack
Bug #6932: Creatures flee from my followers and we have to chase after them
Bug #6939: OpenMW-CS: ID columns are too short
Bug #6949: Sun Damage effect doesn't work in quasi exteriors
Bug #6964: Nerasa Dralor Won't Follow

4
apps/openmw/mwmechanics/aisequence.cpp
View File

@ -281,7 +281,9 @@ namespace MWMechanics
}
else
{
float rating = MWMechanics::getBestActionRating(actor, target);
float rating = 0.f;
if (MWMechanics::canFight(actor, target))
rating = MWMechanics::getBestActionRating(actor, target);
const ESM::Position& targetPos = target.getRefData().getPosition();