mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
Check for world AI disable
This commit is contained in:
parent
1e05bb20bf
commit
b62b0a2f00
@ -1647,12 +1647,13 @@ namespace MWMechanics
|
|||||||
std::string stopKey = "stop";
|
std::string stopKey = "stop";
|
||||||
MWBase::LuaManager::ActorControls* actorControls
|
MWBase::LuaManager::ActorControls* actorControls
|
||||||
= MWBase::Environment::get().getLuaManager()->getActorControls(mPtr);
|
= MWBase::Environment::get().getLuaManager()->getActorControls(mPtr);
|
||||||
|
const bool aiInactive
|
||||||
|
= actorControls->mDisableAI || !MWBase::Environment::get().getMechanicsManager()->isAIActive();
|
||||||
if (mWeaponType != ESM::Weapon::PickProbe && !isRandomAttackAnimation(mCurrentWeapon))
|
if (mWeaponType != ESM::Weapon::PickProbe && !isRandomAttackAnimation(mCurrentWeapon))
|
||||||
{
|
{
|
||||||
if (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown)
|
if (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown)
|
||||||
mAttackType = "shoot";
|
mAttackType = "shoot";
|
||||||
else if (mPtr == getPlayer() || actorControls->mDisableAI)
|
else if (mPtr == getPlayer() || aiInactive)
|
||||||
{
|
{
|
||||||
if (Settings::game().mBestAttack)
|
if (Settings::game().mBestAttack)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user