mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 21:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us

Browse Source
This commit is contained in:
Evil Eye 2023-12-12 22:06:52 +01:00
parent abbb620ea2
commit f80cd06256
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwmechanics/actors.cpp
View File

@ -2090,6 +2090,10 @@ namespace MWMechanics
if (ally.getClass().getCreatureStats(ally).getAiSequence().getCombatTargets(enemies) if (ally.getClass().getCreatureStats(ally).getAiSequence().getCombatTargets(enemies)
&& std::find(enemies.begin(), enemies.end(), actorPtr) != enemies.end()) && std::find(enemies.begin(), enemies.end(), actorPtr) != enemies.end())
break; break;
enemies.clear();
if (actorPtr.getClass().getCreatureStats(actorPtr).getAiSequence().getCombatTargets(enemies)
&& std::find(enemies.begin(), enemies.end(), ally) != enemies.end())
break;
} }
list.push_back(package->getTarget()); list.push_back(package->getTarget());
} }