mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-19 16:21:08 +00:00
Code Issues Projects Releases Wiki Activity

Reuse isPlayer variable instead of using operator !=

Browse Source
This commit is contained in:
elsid 2022-07-04 21:24:55 +02:00
parent 77eaf2082f
commit 03792eebdb
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/openmw/mwmechanics/actors.cpp
View File

@ -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);