mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-10 19:06:43 +00:00
Code Issues Releases Wiki Activity

Use square distance to target

Browse source
This commit is contained in:
Andrei Kortunov 2018-08-27 13:35:49 +04:00
parent 4c0ef4ddb6
commit 2cac8b59b1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwmechanics/aisequence.cpp
View file

@ -228,7 +228,7 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
{ {
if ((*it)->getTypeId() != AiPackage::TypeIdCombat) break; if ((*it)->getTypeId() != AiPackage::TypeIdCombat) break;
MWWorld::Ptr target = static_cast<const AiCombat *>(*it)->getTarget(); MWWorld::Ptr target = (*it)->getTarget();
// target disappeared (e.g. summoned creatures) // target disappeared (e.g. summoned creatures)
if (target.isEmpty()) if (target.isEmpty())
@ -242,11 +242,11 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
const ESM::Position &targetPos = target.getRefData().getPosition(); const ESM::Position &targetPos = target.getRefData().getPosition();
float distTo = (targetPos.asVec3() - vActorPos).length(); float distTo = (targetPos.asVec3() - vActorPos).length2();
// Small threshold for changing target // Small threshold for changing target
if (it == mPackages.begin()) if (it == mPackages.begin())
distTo = std::max(0.f, distTo - 50.f); distTo = std::max(0.f, distTo - 2500.f);
// if a target has higher priority than current target or has same priority but closer // if a target has higher priority than current target or has same priority but closer
if (rating > bestRating || ((distTo < nearestDist) && rating == bestRating)) if (rating > bestRating || ((distTo < nearestDist) && rating == bestRating))