Merge pull request #1369 from akortunov/tauntfix

Take in account a temporary disposition in isAggressive check (bug #3…
8 years ago · a63b9e33fd
parent d32ea7f284 d1489f5b42
commit a63b9e33fd
1 changed files with 1 additions and 1 deletions
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@ -1490,7 +1490,7 @@ namespace MWMechanics
    {
        int disposition = 50;
        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()
                + static_cast<int>(getFightDistanceBias(ptr, target) + getFightDispositionBias(static_cast<float>(disposition))));