krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
scrawl 2014-09-14 10:35:57 +02:00
parent c5fa0768f1
commit 1270dada34
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwclass/creature.cpp
View file

@ -329,7 +329,8 @@ namespace MWClass
{ {
// NOTE: 'object' and/or 'attacker' may be empty. // 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 // Self defense
if ((canWalk(ptr) || canFly(ptr) || canSwim(ptr)) // No retaliation for totally static creatures if ((canWalk(ptr) || canFly(ptr) || canSwim(ptr)) // No retaliation for totally static creatures

6
apps/openmw/mwclass/npc.cpp
View file

@ -640,10 +640,12 @@ namespace MWClass
bool wasDead = getCreatureStats(ptr).isDead(); 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); MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
}
if(!successful) if(!successful)
{ {