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

Merge branch 'endoftheearth' into 'master'

Browse source 
Don't try to escort to nowhere

See merge request OpenMW/openmw!3603
This commit is contained in:
Alexei Kotov 2023-11-24 11:30:18 +00:00
commit 9873ab25df
3 changed files with 15 additions and 11 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)
, mDuration(duration)
, mRemainingDuration(static_cast<float>(duration))
, mCellX(std::numeric_limits<int>::max())
, mCellY(std::numeric_limits<int>::max())
{
mTargetActorRefId = actorId;
}
@ -45,8 +43,6 @@ namespace MWMechanics
, mZ(z)
, mDuration(duration)
, mRemainingDuration(static_cast<float>(duration))
, mCellX(std::numeric_limits<int>::max())
, mCellY(std::numeric_limits<int>::max())
{
mTargetActorRefId = actorId;
}
@ -59,8 +55,6 @@ namespace MWMechanics
, mZ(escort->mData.mZ)
, mDuration(escort->mData.mDuration)
, mRemainingDuration(escort->mRemainingDuration)
, mCellX(std::numeric_limits<int>::max())
, mCellY(std::numeric_limits<int>::max())
{
mTargetActorRefId = escort->mTargetId;
mTargetActorId = escort->mTargetActorId;
@ -96,6 +90,19 @@ namespace MWMechanics
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);
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;
const float mDuration; // In hours
float mRemainingDuration; // In hours
const int mCellX;
const int mCellY;
};
}
#endif

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

@ -467,7 +467,7 @@ namespace MWMechanics
{
ESM::AITarget data = esmPackage.mTarget;
package = std::make_unique<MWMechanics::AiEscort>(ESM::RefId::stringRefId(data.mId.toStringView()),
data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
esmPackage.mCellName, data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
}
else if (esmPackage.mType == ESM::AI_Travel)
{
@ -484,7 +484,7 @@ namespace MWMechanics
{
ESM::AITarget data = esmPackage.mTarget;
package = std::make_unique<MWMechanics::AiFollow>(ESM::RefId::stringRefId(data.mId.toStringView()),
data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
esmPackage.mCellName, data.mDuration, data.mX, data.mY, data.mZ, data.mShouldRepeat != 0);
}
onPackageAdded(*package);