mirror of
https://github.com/OpenMW/openmw.git
synced 2025-10-15 18:16:33 +00:00
Merge branch 'fightthechameleon' into 'master'
Prevent witnesses from ending combat because they didn't get hit See merge request OpenMW/openmw!4814
This commit is contained in:
commit
b937b0271f
1 changed files with 1 additions and 0 deletions
|
@ -1453,6 +1453,7 @@ namespace MWMechanics
|
||||||
}
|
}
|
||||||
|
|
||||||
startCombat(actor, player, &playerFollowers);
|
startCombat(actor, player, &playerFollowers);
|
||||||
|
observerStats.setHitAttemptActorId(player.getClass().getCreatureStats(player).getActorId());
|
||||||
|
|
||||||
// Apply aggression value to the base Fight rating, so that the actor can continue fighting
|
// Apply aggression value to the base Fight rating, so that the actor can continue fighting
|
||||||
// after a Calm spell wears off
|
// after a Calm spell wears off
|
||||||
|
|
Loading…
Reference in a new issue