mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 12:36:40 +00:00
Code Issues Releases Wiki Activity

Don't try to start combat with oneself and don't tell the player what to do

Browse source
This commit is contained in:
Evil Eye 2022-07-06 19:12:36 +02:00
parent 510a9b9a5e
commit e42d63f4a4
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -1463,10 +1463,13 @@ namespace MWMechanics
std::set<MWWorld::Ptr> followersTarget; std::set<MWWorld::Ptr> followersTarget;
getActorsSidingWith(target, followersTarget); getActorsSidingWith(target, followersTarget);
for(const auto& follower : followersTarget) for(const auto& follower : followersTarget)
{
if(follower != attacker && follower != player)
startCombat(follower, attacker); startCombat(follower, attacker);
} }
} }
} }
}
return true; return true;
} }