mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-19 16:21:08 +00:00
Merge pull request #1369 from akortunov/tauntfix
Take in account a temporary disposition in isAggressive check (bug #3…
This commit is contained in:
commit
a63b9e33fd
@ -1490,7 +1490,7 @@ namespace MWMechanics
|
|||||||
{
|
{
|
||||||
int disposition = 50;
|
int disposition = 50;
|
||||||
if (ptr.getClass().isNpc())
|
if (ptr.getClass().isNpc())
|
||||||
disposition = getDerivedDisposition(ptr, false);
|
disposition = getDerivedDisposition(ptr, true);
|
||||||
|
|
||||||
int fight = std::max(0, ptr.getClass().getCreatureStats(ptr).getAiSetting(CreatureStats::AI_Fight).getModified()
|
int fight = std::max(0, ptr.getClass().getCreatureStats(ptr).getAiSetting(CreatureStats::AI_Fight).getModified()
|
||||||
+ static_cast<int>(getFightDistanceBias(ptr, target) + getFightDispositionBias(static_cast<float>(disposition))));
|
+ static_cast<int>(getFightDistanceBias(ptr, target) + getFightDispositionBias(static_cast<float>(disposition))));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user