mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-04-07 13:20:25 +00:00
Merge pull request #1636
This commit is contained in:
commit
ff7f964643
@ -189,7 +189,7 @@ void MWMechanics::AiPackage::evadeObstacles(const MWWorld::Ptr& actor, float dur
|
|||||||
static float distance = MWBase::Environment::get().getWorld()->getMaxActivationDistance();
|
static float distance = MWBase::Environment::get().getWorld()->getMaxActivationDistance();
|
||||||
|
|
||||||
MWWorld::Ptr door = getNearbyDoor(actor, distance);
|
MWWorld::Ptr door = getNearbyDoor(actor, distance);
|
||||||
if (door != MWWorld::Ptr())
|
if (door != MWWorld::Ptr() && actor.getClass().isBipedal(actor))
|
||||||
{
|
{
|
||||||
// note: AiWander currently does not open doors
|
// note: AiWander currently does not open doors
|
||||||
if (getTypeId() != TypeIdWander && !door.getCellRef().getTeleport() && door.getClass().getDoorState(door) == 0)
|
if (getTypeId() != TypeIdWander && !door.getCellRef().getTeleport() && door.getClass().getDoorState(door) == 0)
|
||||||
@ -224,7 +224,7 @@ void MWMechanics::AiPackage::evadeObstacles(const MWWorld::Ptr& actor, float dur
|
|||||||
MWBase::Environment::get().getWorld()->activate(door, actor);
|
MWBase::Environment::get().getWorld()->activate(door, actor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // any other obstacle (NPC, crate, etc.)
|
else
|
||||||
{
|
{
|
||||||
mObstacleCheck.takeEvasiveAction(movement);
|
mObstacleCheck.takeEvasiveAction(movement);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user