mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 06:39:42 +00:00
Code Issues Releases Wiki Activity

Restructure function isCommanded

Browse source
This commit is contained in:
ζeh Matt 2022-03-28 16:07:20 +03:00
parent 1c70b9790c
commit f5b527e445
No known key found for this signature in database
GPG key ID: 18CE582C71A225B0
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/openmw/mwmechanics/actors.cpp
View file

@ -56,14 +56,17 @@ bool isConscious(const MWWorld::Ptr& ptr)
bool isCommanded(const MWWorld::Ptr& actor)
{
const auto& stats = actor.getClass().getCreatureStats(actor);
for(const auto& params : stats.getActiveSpells())
const auto& actorClass = actor.getClass();
const auto& stats = actorClass.getCreatureStats(actor);
const bool isActorNpc = actorClass.isNpc();
const auto level = stats.getLevel();
for (const auto& params : stats.getActiveSpells())
{
for(const auto& effect : params.getEffects())
for (const auto& effect : params.getEffects())
{
if(((effect.mEffectId == ESM::MagicEffect::CommandHumanoid && actor.getClass().isNpc())
|| (effect.mEffectId == ESM::MagicEffect::CommandCreature && !actor.getClass().isNpc()))
&& effect.mMagnitude >= stats.getLevel())
if (((effect.mEffectId == ESM::MagicEffect::CommandHumanoid && isActorNpc)
|| (effect.mEffectId == ESM::MagicEffect::CommandCreature && !isActorNpc))
&& effect.mMagnitude >= level)
return true;
}
}