mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 16:20:21 +00:00
Code Issues Projects 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

5
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View File

@ -1463,7 +1463,10 @@ 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)
startCombat(follower, attacker); {
if(follower != attacker && follower != player)
startCombat(follower, attacker);
}
} }
} }
} }