Commit 1270dada authored by scrawl's avatar scrawl

Don't set Attacked flag when the actor is already in combat with the attacker (Fixes #1909)

parent c5fa0768
......@@ -329,7 +329,8 @@ namespace MWClass
{
// NOTE: 'object' and/or 'attacker' may be empty.
getCreatureStats(ptr).setAttacked(true);
if (!attacker.isEmpty() && !ptr.getClass().getCreatureStats(ptr).getAiSequence().isInCombat(attacker))
getCreatureStats(ptr).setAttacked(true);
// Self defense
if ((canWalk(ptr) || canFly(ptr) || canSwim(ptr)) // No retaliation for totally static creatures
......
......@@ -640,10 +640,12 @@ namespace MWClass
bool wasDead = getCreatureStats(ptr).isDead();
getCreatureStats(ptr).setAttacked(true);
if (!attacker.isEmpty() && !ptr.getClass().getCreatureStats(ptr).getAiSequence().isInCombat(attacker))
{
getCreatureStats(ptr).setAttacked(true);
if (!attacker.isEmpty())
MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
}
if(!successful)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment