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

Don't try to escort to nowhere

Browse source
This commit is contained in:
Evil Eye 2023-11-19 10:25:20 +01:00
parent 5a1a54b959
commit 1b820b980a
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwmechanics/aiescort.cpp
View file

@ -30,8 +30,6 @@ namespace MWMechanics
, mZ(z) , mZ(z)
, mDuration(duration) , mDuration(duration)
, mRemainingDuration(static_cast<float>(duration)) , mRemainingDuration(static_cast<float>(duration))
, mCellX(std::numeric_limits<int>::max())
, mCellY(std::numeric_limits<int>::max())
{ {
mTargetActorRefId = actorId; mTargetActorRefId = actorId;
} }
@ -45,8 +43,6 @@ namespace MWMechanics
, mZ(z) , mZ(z)
, mDuration(duration) , mDuration(duration)
, mRemainingDuration(static_cast<float>(duration)) , mRemainingDuration(static_cast<float>(duration))
, mCellX(std::numeric_limits<int>::max())
, mCellY(std::numeric_limits<int>::max())
{ {
mTargetActorRefId = actorId; mTargetActorRefId = actorId;
} }
@ -59,8 +55,6 @@ namespace MWMechanics
, mZ(escort->mData.mZ) , mZ(escort->mData.mZ)
, mDuration(escort->mData.mDuration) , mDuration(escort->mData.mDuration)
, mRemainingDuration(escort->mRemainingDuration) , mRemainingDuration(escort->mRemainingDuration)
, mCellX(std::numeric_limits<int>::max())
, mCellY(std::numeric_limits<int>::max())
{ {
mTargetActorRefId = escort->mTargetId; mTargetActorRefId = escort->mTargetId;
mTargetActorId = escort->mTargetActorId; mTargetActorId = escort->mTargetActorId;
@ -96,6 +90,19 @@ namespace MWMechanics
if ((leaderPos - followerPos).length2() <= mMaxDist * mMaxDist) if ((leaderPos - followerPos).length2() <= mMaxDist * mMaxDist)
{ {
// TESCS allows the creation of Escort packages without a specific destination
constexpr float nowhere = std::numeric_limits<float>::max();
if (mX == nowhere || mY == nowhere)
return true;
if (mZ == nowhere)
{
if (mCellId.empty()
&& ESM::positionToExteriorCellLocation(mX, mY)
== actor.getCell()->getCell()->getExteriorCellLocation())
return false;
return true;
}
const osg::Vec3f dest(mX, mY, mZ); const osg::Vec3f dest(mX, mY, mZ);
if (pathTo(actor, dest, duration, characterController.getSupportedMovementDirections(), maxHalfExtent)) if (pathTo(actor, dest, duration, characterController.getSupportedMovementDirections(), maxHalfExtent))
{ {

3
apps/openmw/mwmechanics/aiescort.hpp
View file

@ -59,9 +59,6 @@ namespace MWMechanics
float mMaxDist = 450; float mMaxDist = 450;
const float mDuration; // In hours const float mDuration; // In hours
float mRemainingDuration; // In hours float mRemainingDuration; // In hours
const int mCellX;
const int mCellY;
}; };
} }
#endif #endif