mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-09-16 07:49:05 -04:00
Merge branch 'stop_hitting_yourself' into 'master'
Don't try to start combat with oneself and don't tell the player what to do Closes #6856 See merge request OpenMW/openmw!2110
This commit is contained in:
commit
7fd87ff34f
@ -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;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user