mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2212 from elsid/navigator_log_spam

Browse Source 
Do not build path by navigator for pure water and flying creatures
This commit is contained in:
Bret Curtis 2019-03-06 21:37:41 +01:00 committed by GitHub
commit 8bd7effae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwmechanics/pathfinding.cpp
View File

@ -286,7 +286,8 @@ namespace MWMechanics
mPath.clear();
mCell = cell;
buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags, std::back_inserter(mPath));
if (!actor.getClass().isPureWaterCreature(actor) && !actor.getClass().isPureFlyingCreature(actor))
buildPathByNavigatorImpl(actor, startPoint, endPoint, halfExtents, flags, std::back_inserter(mPath));
if (mPath.empty())
buildPathByPathgridImpl(startPoint, endPoint, pathgridGraph, std::back_inserter(mPath));

4
apps/openmw/mwworld/class.cpp
View File

@ -407,7 +407,7 @@ namespace MWWorld
return false;
}
bool Class::isPureWaterCreature(const MWWorld::Ptr& ptr) const
bool Class::isPureWaterCreature(const ConstPtr& ptr) const
{
return canSwim(ptr)
&& !isBipedal(ptr)
@ -415,7 +415,7 @@ namespace MWWorld
&& !canWalk(ptr);
}
bool Class::isPureFlyingCreature(const Ptr& ptr) const
bool Class::isPureFlyingCreature(const ConstPtr& ptr) const
{
return canFly(ptr)
&& !isBipedal(ptr)

4
apps/openmw/mwworld/class.hpp
View File

@ -324,8 +324,8 @@ namespace MWWorld
virtual bool canFly(const MWWorld::ConstPtr& ptr) const;
virtual bool canSwim(const MWWorld::ConstPtr& ptr) const;
virtual bool canWalk(const MWWorld::ConstPtr& ptr) const;
bool isPureWaterCreature(const MWWorld::Ptr& ptr) const;
bool isPureFlyingCreature(const MWWorld::Ptr& ptr) const;
bool isPureWaterCreature(const MWWorld::ConstPtr& ptr) const;
bool isPureFlyingCreature(const MWWorld::ConstPtr& ptr) const;
bool isPureLandCreature(const MWWorld::Ptr& ptr) const;
bool isMobile(const MWWorld::Ptr& ptr) const;