From 868e38a07c5e1130e1ee3ce61866d3d0a6475def Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 16 May 2014 08:32:00 +0200 Subject: [PATCH] Fix Assault crimes being reported when striking in self-defense Last missing fix for Bug #1134. --- apps/openmw/mwclass/npc.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp index 845fffbc0d..6d2eea6af5 100644 --- a/apps/openmw/mwclass/npc.cpp +++ b/apps/openmw/mwclass/npc.cpp @@ -621,7 +621,8 @@ namespace MWClass // Attacking peaceful NPCs is a crime // anything below 80 is considered peaceful (see Actors::updateActor) - if (!attacker.isEmpty() && ptr.getClass().getCreatureStats(ptr).getAiSetting(MWMechanics::CreatureStats::AI_Fight).getModified() < 80) + if (!attacker.isEmpty() && !ptr.getClass().getCreatureStats(ptr).isHostile() && + ptr.getClass().getCreatureStats(ptr).getAiSetting(MWMechanics::CreatureStats::AI_Fight).getModified() < 80) MWBase::Environment::get().getMechanicsManager()->commitCrime(attacker, ptr, MWBase::MechanicsManager::OT_Assault); getCreatureStats(ptr).setAttacked(true);