mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-16 16:20:53 +00:00
Revert "Rearranged check for better performance"
This reverts commit 332ceb51a25c40caba4444174216794652094be8.
This commit is contained in:
parent
f2d4f290cc
commit
5a12407436
@ -300,10 +300,6 @@ namespace MWMechanics
|
||||
if (!actor1.getClass().isMobile(actor1))
|
||||
return;
|
||||
|
||||
// Stop here if target is unreachable
|
||||
if (!MWMechanics::canFight(actor1, actor2))
|
||||
return;
|
||||
|
||||
// If this is set to true, actor1 will start combat with actor2 if the awareness check at the end of the method returns true
|
||||
bool aggressive = false;
|
||||
|
||||
@ -379,6 +375,10 @@ namespace MWMechanics
|
||||
}
|
||||
}
|
||||
|
||||
// Stop here if target is unreachable
|
||||
if (!MWMechanics::canFight(actor1, actor2))
|
||||
return;
|
||||
|
||||
// Do aggression check if actor2 is the player or a player follower or escorter
|
||||
if (!aggressive)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user