mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:23:51 +00:00
Code Issues Releases Wiki Activity

Allow water walking actors to find path over water surface

Browse source
This commit is contained in:
elsid 2021-04-11 19:17:23 +02:00
parent 634556be9d
commit 28fc21792e
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,4 +23,10 @@ namespace MWMechanics
MWBase::World* world = MWBase::Environment::get().getWorld(); MWBase::World* world = MWBase::Environment::get().getWorld();
return (actor.getClass().canSwim(actor) && world->isSwimming(actor)) || world->isFlying(actor); return (actor.getClass().canSwim(actor) && world->isSwimming(actor)) || world->isFlying(actor);
} }
bool hasWaterWalking(const MWWorld::Ptr& actor)
{
const MWMechanics::MagicEffects& effects = actor.getClass().getCreatureStats(actor).getMagicEffects();
return effects.get(ESM::MagicEffect::WaterWalking).getMagnitude() > 0;
}
} }

1
apps/openmw/mwmechanics/actorutil.hpp
View file

@ -31,6 +31,7 @@ namespace MWMechanics
MWWorld::Ptr getPlayer(); MWWorld::Ptr getPlayer();
bool isPlayerInCombat(); bool isPlayerInCombat();
bool canActorMoveByZAxis(const MWWorld::Ptr& actor); bool canActorMoveByZAxis(const MWWorld::Ptr& actor);
bool hasWaterWalking(const MWWorld::Ptr& actor);
template<class T> template<class T>
void setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value) void setBaseAISetting(const std::string& id, MWMechanics::CreatureStats::AiSetting setting, int value)

3
apps/openmw/mwmechanics/aipackage.cpp
View file

@ -419,7 +419,8 @@ DetourNavigator::Flags MWMechanics::AiPackage::getNavigatorFlags(const MWWorld::
if (actorClass.isPureWaterCreature(actor) if (actorClass.isPureWaterCreature(actor)
|| (getTypeId() != AiPackageTypeId::Wander || (getTypeId() != AiPackageTypeId::Wander
&& ((allowToFollowOverWaterSurface && getTypeId() == AiPackageTypeId::Follow) && ((allowToFollowOverWaterSurface && getTypeId() == AiPackageTypeId::Follow)
|| actorClass.canSwim(actor)))) || actorClass.canSwim(actor)
|| hasWaterWalking(actor))))
result |= DetourNavigator::Flag_swim; result |= DetourNavigator::Flag_swim;
if (actorClass.canWalk(actor)) if (actorClass.canWalk(actor))