mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 13:36:42 +00:00
Code Issues Releases Wiki Activity

Make AiWander::isPackageCompleted const

Browse source
This commit is contained in:
elsid 2020-05-16 14:58:50 +02:00
parent 131f2557b1
commit 256c9917a4
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/openmw/mwmechanics/aiwander.cpp
View file

@ -235,8 +235,9 @@ namespace MWMechanics
if (mDistance <= 0) if (mDistance <= 0)
storage.mCanWanderAlongPathGrid = false; storage.mCanWanderAlongPathGrid = false;
if (isPackageCompleted(actor)) if (isPackageCompleted())
{ {
stopWalking(actor);
// Reset package so it can be used again // Reset package so it can be used again
mRemainingDuration=mDuration; mRemainingDuration=mDuration;
init(); init();
@ -320,19 +321,10 @@ namespace MWMechanics
return actor.getRefData().getPosition().asVec3(); return actor.getRefData().getPosition().asVec3();
} }
bool AiWander::isPackageCompleted(const MWWorld::Ptr& actor) bool AiWander::isPackageCompleted() const
{ {
if (mDuration) // End package if duration is complete
{ return mDuration && mRemainingDuration <= 0;
// End package if duration is complete
if (mRemainingDuration <= 0)
{
stopWalking(actor);
return true;
}
}
// if get here, not yet completed
return false;
} }
/* /*

2
apps/openmw/mwmechanics/aiwander.hpp
View file

@ -133,7 +133,7 @@ namespace MWMechanics
void onWalkingStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage); void onWalkingStatePerFrameActions(const MWWorld::Ptr& actor, float duration, AiWanderStorage& storage);
void onChooseActionStatePerFrameActions(const MWWorld::Ptr& actor, AiWanderStorage& storage); void onChooseActionStatePerFrameActions(const MWWorld::Ptr& actor, AiWanderStorage& storage);
bool reactionTimeActions(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos); bool reactionTimeActions(const MWWorld::Ptr& actor, AiWanderStorage& storage, ESM::Position& pos);
bool isPackageCompleted(const MWWorld::Ptr& actor); inline bool isPackageCompleted() const;
void wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance); void wanderNearStart(const MWWorld::Ptr &actor, AiWanderStorage &storage, int wanderDistance);
bool destinationIsAtWater(const MWWorld::Ptr &actor, const osg::Vec3f& destination); bool destinationIsAtWater(const MWWorld::Ptr &actor, const osg::Vec3f& destination);
void completeManualWalking(const MWWorld::Ptr &actor, AiWanderStorage &storage); void completeManualWalking(const MWWorld::Ptr &actor, AiWanderStorage &storage);