Merged pull request #1840

CHANGELOG.md

@@ -75,6 +75,7 @@
     Bug #4510: Division by zero in MWMechanics::CreatureStats::setAttribute
     Bug #4519: Knockdown does not discard movement in the 1st-person mode
     Bug #4539: Paper Doll is affected by GUI scaling
+    Bug #4545: Creatures flee from werewolves
     Feature #2606: Editor: Implemented (optional) case sensitive global search
     Feature #3083: Play animation when NPC is casting spell via script
     Feature #3103: Provide option for disposition to get increased by successful trade

apps/openmw/mwmechanics/aicombataction.cpp

@@ -494,11 +494,14 @@ namespace MWMechanics
 
         static const int iWereWolfLevelToAttack = gmst.find("iWereWolfLevelToAttack")->getInt();
 
-        if (enemy.getClass().isNpc() && enemy.getClass().getNpcStats(enemy).isWerewolf() && stats.getLevel() < iWereWolfLevelToAttack)
+        if (actor.getClass().isNpc() && enemy.getClass().isNpc())
+        {
+            if (enemy.getClass().getNpcStats(enemy).isWerewolf() && stats.getLevel() < iWereWolfLevelToAttack)
             {
                 static const int iWereWolfFleeMod = gmst.find("iWereWolfFleeMod")->getInt();
                 rating = iWereWolfFleeMod;
             }
+        }
 
         if (rating != 0.0f)
             rating += getFightDistanceBias(actor, enemy);