mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
Reuse isPlayer variable instead of using operator !=
This commit is contained in:
parent
77eaf2082f
commit
03792eebdb
@ -1450,7 +1450,7 @@ namespace MWMechanics
|
|||||||
bool inProcessingRange = distSqr <= mActorsProcessingRange*mActorsProcessingRange;
|
bool inProcessingRange = distSqr <= mActorsProcessingRange*mActorsProcessingRange;
|
||||||
|
|
||||||
// If dead or no longer in combat, no longer store any actors who attempted to hit us. Also remove for the player.
|
// If dead or no longer in combat, no longer store any actors who attempted to hit us. Also remove for the player.
|
||||||
if (actor.getPtr() != player && (actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead()
|
if (!isPlayer && (actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead()
|
||||||
|| !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getAiSequence().isInCombat()
|
|| !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).getAiSequence().isInCombat()
|
||||||
|| !inProcessingRange))
|
|| !inProcessingRange))
|
||||||
{
|
{
|
||||||
@ -1504,10 +1504,10 @@ namespace MWMechanics
|
|||||||
if (mTimerUpdateHeadTrack == 0)
|
if (mTimerUpdateHeadTrack == 0)
|
||||||
updateHeadTracking(actor.getPtr(), mActors, isPlayer, ctrl);
|
updateHeadTracking(actor.getPtr(), mActors, isPlayer, ctrl);
|
||||||
|
|
||||||
if (actor.getPtr().getClass().isNpc() && actor.getPtr() != player)
|
if (actor.getPtr().getClass().isNpc() && !isPlayer)
|
||||||
updateCrimePursuit(actor.getPtr(), duration);
|
updateCrimePursuit(actor.getPtr(), duration);
|
||||||
|
|
||||||
if (actor.getPtr() != player)
|
if (!isPlayer)
|
||||||
{
|
{
|
||||||
CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
|
CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
|
||||||
if (isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
|
if (isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
|
||||||
@ -1519,7 +1519,7 @@ namespace MWMechanics
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (aiActive && actor.getPtr() != player && isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
|
else if (aiActive && !isPlayer && isConscious(actor.getPtr()) && !(luaControls && luaControls->mDisableAI))
|
||||||
{
|
{
|
||||||
CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
|
CreatureStats &stats = actor.getPtr().getClass().getCreatureStats(actor.getPtr());
|
||||||
stats.getAiSequence().execute(actor.getPtr(), ctrl, duration, /*outOfRange*/true);
|
stats.getAiSequence().execute(actor.getPtr(), ctrl, duration, /*outOfRange*/true);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user